drivers/perf: arm_pmu: split cpu-local irq request/free

[karo-tx-linux.git] / kernel / relay.c

diff --git a/kernel/relay.c b/kernel/relay.c
index 8f18d314a96a49a1e9fc6c4cf1c5bead5c96a787..0e413d9eec8af484517300e1c142325356865771 100644 (file)
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -39,10 +39,10 @@ static void relay_file_mmap_close(struct vm_area_struct *vma)
 /*
  * fault() vm_op implementation for relay file mapping.
  */
-static int relay_buf_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+static int relay_buf_fault(struct vm_fault *vmf)
 {
        struct page *page;
-       struct rchan_buf *buf = vma->vm_private_data;
+       struct rchan_buf *buf = vmf->vma->vm_private_data;
        pgoff_t pgoff = vmf->pgoff;
 
        if (!buf)
@@ -847,7 +847,7 @@ void relay_close(struct rchan *chan)
 
        if (chan->last_toobig)
                printk(KERN_WARNING "relay: one or more items not logged "
-                      "[item size (%Zd) > sub-buffer size (%Zd)]\n",
+                      "[item size (%zd) > sub-buffer size (%zd)]\n",
                       chan->last_toobig, chan->subbuf_size);
 
        list_del(&chan->list);