Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

[linux-drm-fsl-dcu.git] / fs / proc / inode.c

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 8eaa1ba793fc188879d405e768a81aedbaa4bf76..28955d4b7218e95a6ba7666111459b0382450786 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -285,19 +285,23 @@ static int proc_reg_mmap(struct file *file, struct vm_area_struct *vma)
        return rv;
 }
 
-static unsigned long proc_reg_get_unmapped_area(struct file *file, unsigned long orig_addr, unsigned long len, unsigned long pgoff, unsigned long flags)
+static unsigned long
+proc_reg_get_unmapped_area(struct file *file, unsigned long orig_addr,
+                          unsigned long len, unsigned long pgoff,
+                          unsigned long flags)
 {
        struct proc_dir_entry *pde = PDE(file_inode(file));
        unsigned long rv = -EIO;
-       unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) = NULL;
+       unsigned long (*get_area)(struct file *, unsigned long, unsigned long,
+                                 unsigned long, unsigned long) = NULL;
        if (use_pde(pde)) {
 #ifdef CONFIG_MMU
-               get_unmapped_area = current->mm->get_unmapped_area;
+               get_area = current->mm->get_unmapped_area;
 #endif
                if (pde->proc_fops->get_unmapped_area)
-                       get_unmapped_area = pde->proc_fops->get_unmapped_area;
-               if (get_unmapped_area)
-                       rv = get_unmapped_area(file, orig_addr, len, pgoff, flags);
+                       get_area = pde->proc_fops->get_unmapped_area;
+               if (get_area)
+                       rv = get_area(file, orig_addr, len, pgoff, flags);
                unuse_pde(pde);
        }
        return rv;