Linux Headquarters
[ Register ]
[ About us ] [ Home Page ]

Advertisement
[ Kernel ] [ Documentation ] [ Links ] [ Books ]

Kernel v2.6.24-rc3-git7 /kernel/sys.c

Filename:/kernel/sys.c
Lines Added:1
Lines Deleted:19
Also changed in: (Previous) 2.6.24-rc3-git6  2.6.24-rc3-git5  2.6.24-rc3-git4  2.6.24-rc3-git3  2.6.24-rc3-git2  2.6.24-rc3-git1 
(Following) 2.6.24-rc4  2.6.24-rc5  2.6.24-rc6  2.6.24-rc7  2.6.24-rc8  2.6.24 

Location
[  2.6.24-rc3-git7
  [  kernel
     o  sys.c

Patch

diff --git a/kernel/sys.c b/kernel/sys.c
index 304b541..d1fe71e 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1750,7 +1750,7 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
 }
 
 asmlinkage long sys_getcpu(unsigned __user *cpup, unsigned __user *nodep,
-               struct getcpu_cache __user *cache)
+            struct getcpu_cache __user *unused)
 {
    int err = 0;
    int cpu = raw_smp_processor_id();
@@ -1758,24 +1758,6 @@ asmlinkage long sys_getcpu(unsigned __user *cpup, unsigned __user *nodep,
       err |= put_user(cpu, cpup);
    if (nodep)
       err |= put_user(cpu_to_node(cpu), nodep);
-   if (cache) {
-      /*
-       * The cache is not needed for this implementation,
-       * but make sure user programs pass something
-       * valid. vsyscall implementations can instead make
-       * good use of the cache. Only use t0 and t1 because
-       * these are available in both 32bit and 64bit ABI (no
-       * need for a compat_getcpu). 32bit has enough
-       * padding
-       */
-      unsigned long t0, t1;
-      get_user(t0, &cache->blob[0]);
-      get_user(t1, &cache->blob[1]);
-      t0++;
-      t1++;
-      put_user(t0, &cache->blob[0]);
-      put_user(t1, &cache->blob[1]);
-   }
    return err ? -EFAULT : 0;
 }
 


Comments: webmaster (at) linuxhq.com.
Advertising: banners (at) linuxhq.com.
Compilation ©1998-2008 Linux Headquarters, Inc.