Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump...

[mv-sheeva.git] / arch / x86 / kernel / sys_x86_64.c

diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
index 3b360ef33817c9b618e661f452e682a43dfe91bc..6bc211accf087ed2be1a381395eae95093f4dbf4 100644 (file)
--- a/arch/x86/kernel/sys_x86_64.c
+++ b/arch/x86/kernel/sys_x86_64.c
@@ -13,15 +13,17 @@
 #include <linux/utsname.h>
 #include <linux/personality.h>
 #include <linux/random.h>
 #include <linux/utsname.h>
 #include <linux/personality.h>
 #include <linux/random.h>

+#include <linux/uaccess.h>

 
 

-#include <asm/uaccess.h>

 #include <asm/ia32.h>
 #include <asm/ia32.h>

+#include <asm/syscalls.h>

 
 

-asmlinkage long sys_mmap(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags,
-       unsigned long fd, unsigned long off)
+asmlinkage long sys_mmap(unsigned long addr, unsigned long len,
+               unsigned long prot, unsigned long flags,
+               unsigned long fd, unsigned long off)

 {
        long error;
 {
        long error;

-       struct file * file;
+       struct file *file;

 
        error = -EINVAL;
        if (off & ~PAGE_MASK)
 
        error = -EINVAL;
        if (off & ~PAGE_MASK)


@@ -56,9 +58,9 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
                   unmapped base down for this case. This can give
                   conflicts with the heap, but we assume that glibc
                   malloc knows how to fall back to mmap. Give it 1GB
                   unmapped base down for this case. This can give
                   conflicts with the heap, but we assume that glibc
                   malloc knows how to fall back to mmap. Give it 1GB

-                  of playground for now. -AK */ 
-               *begin = 0x40000000; 
-               *end = 0x80000000;              
+                  of playground for now. -AK */
+               *begin = 0x40000000;
+               *end = 0x80000000;

                if (current->flags & PF_RANDOMIZE) {
                        new_begin = randomize_range(*begin, *begin + 0x02000000, 0);
                        if (new_begin)
                if (current->flags & PF_RANDOMIZE) {
                        new_begin = randomize_range(*begin, *begin + 0x02000000, 0);
                        if (new_begin)


@@ -66,9 +68,9 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
                }
        } else {
                *begin = TASK_UNMAPPED_BASE;
                }
        } else {
                *begin = TASK_UNMAPPED_BASE;

-               *end = TASK_SIZE; 
+               *end = TASK_SIZE;

        }
        }

-} 
+}

 
 unsigned long
 arch_get_unmapped_area(struct file *filp, unsigned long addr,
 
 unsigned long
 arch_get_unmapped_area(struct file *filp, unsigned long addr,


@@ -78,11 +80,11 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
        struct vm_area_struct *vma;
        unsigned long start_addr;
        unsigned long begin, end;
        struct vm_area_struct *vma;
        unsigned long start_addr;
        unsigned long begin, end;

-       
+

        if (flags & MAP_FIXED)
                return addr;
 
        if (flags & MAP_FIXED)
                return addr;
 

-       find_start_end(flags, &begin, &end); 
+       find_start_end(flags, &begin, &end);

 
        if (len > end)
                return -ENOMEM;
 
        if (len > end)
                return -ENOMEM;


@@ -96,12 +98,12 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
        }
        if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
            && len <= mm->cached_hole_size) {
        }
        if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
            && len <= mm->cached_hole_size) {

-               mm->cached_hole_size = 0;
+               mm->cached_hole_size = 0;

                mm->free_area_cache = begin;
        }
        addr = mm->free_area_cache;
                mm->free_area_cache = begin;
        }
        addr = mm->free_area_cache;

-       if (addr < begin) 
-               addr = begin; 
+       if (addr < begin)
+               addr = begin;

        start_addr = addr;
 
 full_search:
        start_addr = addr;
 
 full_search:


@@ -127,7 +129,7 @@ full_search:
                        return addr;
                }
                if (addr + mm->cached_hole_size < vma->vm_start)
                        return addr;
                }
                if (addr + mm->cached_hole_size < vma->vm_start)

-                       mm->cached_hole_size = vma->vm_start - addr;
+                       mm->cached_hole_size = vma->vm_start - addr;

 
                addr = vma->vm_end;
        }
 
                addr = vma->vm_end;
        }


@@ -177,7 +179,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
                vma = find_vma(mm, addr-len);
                if (!vma || addr <= vma->vm_start)
                        /* remember the address as a hint for next time */
                vma = find_vma(mm, addr-len);
                if (!vma || addr <= vma->vm_start)
                        /* remember the address as a hint for next time */

-                       return (mm->free_area_cache = addr-len);
+                       return mm->free_area_cache = addr-len;

        }
 
        if (mm->mmap_base < len)
        }
 
        if (mm->mmap_base < len)


@@ -194,7 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
                vma = find_vma(mm, addr);
                if (!vma || addr+len <= vma->vm_start)
                        /* remember the address as a hint for next time */
                vma = find_vma(mm, addr);
                if (!vma || addr+len <= vma->vm_start)
                        /* remember the address as a hint for next time */

-                       return (mm->free_area_cache = addr);
+                       return mm->free_area_cache = addr;

 
                /* remember the largest hole we saw so far */
                if (addr + mm->cached_hole_size < vma->vm_start)
 
                /* remember the largest hole we saw so far */
                if (addr + mm->cached_hole_size < vma->vm_start)


@@ -224,13 +226,13 @@ bottomup:
 }
 
 
 }
 
 

-asmlinkage long sys_uname(struct new_utsname __user * name)
+asmlinkage long sys_uname(struct new_utsname __user *name)

 {
        int err;
        down_read(&uts_sem);
 {
        int err;
        down_read(&uts_sem);

-       err = copy_to_user(name, utsname(), sizeof (*name));
+       err = copy_to_user(name, utsname(), sizeof(*name));

        up_read(&uts_sem);
        up_read(&uts_sem);

-       if (personality(current->personality) == PER_LINUX32) 
-               err |= copy_to_user(&name->machine, "i686", 5);                 
+       if (personality(current->personality) == PER_LINUX32)
+               err |= copy_to_user(&name->machine, "i686", 5);

        return err ? -EFAULT : 0;
 }
        return err ? -EFAULT : 0;
 }