Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
  [PATCH] Use early clobber in semaphores
  [PATCH] Define vsyscall cache as blob to make clearer that user space shouldn't use it
  [PATCH] Re-positioning the bss segment
  [PATCH] Use ARRAY_SIZE in setup.c
  [PATCH] i386: replace intermediate array-size definitions with ARRAY_SIZE()
  [PATCH] x86: Clean up x86 NMI sysctls
  [PATCH] Refactor some duplicated code in mpparse.c
  [PATCH] Document iommu=panic
  [PATCH] Fix broken indentation in iommu_setup
  [PATCH] Allow disabling DAC using command line options
  [PATCH] Add proper sparse __user casts to __copy_to_user_inatomic
  [PATCH] i386: Update defconfig
  [PATCH] Update defconfig

1 files changed, 4 insertions, 4 deletions

diff --git a/kernel/sys.c b/kernel/sys.c
index 8647061c084a..b88806c66244 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2083,12 +2083,12 @@ asmlinkage long sys_getcpu(unsigned __user *cpup, unsigned __user *nodep,
                  * padding
                  */
                 unsigned long t0, t1;
-                get_user(t0, &cache->t0);
-                get_user(t1, &cache->t1);
+                get_user(t0, &cache->blob[0]);
+                get_user(t1, &cache->blob[1]);
                 t0++;
                 t1++;
-                put_user(t0, &cache->t0);
-                put_user(t1, &cache->t1);
+                put_user(t0, &cache->blob[0]);
+                put_user(t1, &cache->blob[1]);
         }
         return err ? -EFAULT : 0;
 }