Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: vdso: Remove unused variable
  x86-64: Optimize vDSO time()
  x86-64: Add time to vDSO
  x86-64: Turn off -pg and turn on -foptimize-sibling-calls for vDSO
  x86-64: Move vread_tsc into a new file with sensible options
  x86-64: Vclock_gettime(CLOCK_MONOTONIC) can't ever see nsec < 0
  x86-64: Don't generate cmov in vread_tsc
  x86-64: Remove unnecessary barrier in vread_tsc
  x86-64: Clean up vdso/kernel shared variables

diff --cc arch/x86/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/x86/kernel/vsyscall_64.c
index 59be48d0d75c3129bba6c500e970bca0b91f2d30,5f6ad032575aa353ac3e5da5232b9a9c8d7fd7cf..3e682184d76c7997d090430db61d52e4826270e8
--- 1/arch/x86/kernel/vsyscall_64.c
--- 2/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@@ -49,17 -49,10 +49,10 @@@
                __attribute__ ((unused, __section__(".vsyscall_" #nr))) notrace
  #define __syscall_clobber "r11","cx","memory"
  
- /*
-  * vsyscall_gtod_data contains data that is :
-  * - readonly from vsyscalls
-  * - written by timer interrupt or systcl (/proc/sys/kernel/vsyscall64)
-  * Try to keep this structure as small as possible to avoid cache line ping pongs
-  */
- int __vgetcpu_mode __section_vgetcpu_mode;
- 
- struct vsyscall_gtod_data __vsyscall_gtod_data __section_vsyscall_gtod_data =
+ DEFINE_VVAR(int, vgetcpu_mode);
+ DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
  {
 -      .lock = SEQLOCK_UNLOCKED,
 +      .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
        .sysctl_enabled = 1,
  };