[PATCH] Allow xtime_lock declaration in arch specific code for x86-64

x86-64 vsyscalls require mapping the sequence number used by
gettimeofday in a magic way, so that userland can access it via
vsyscalls for user space time-of-day access.

Instead of putting the magic into generic code I just allowed to move it
into architecture specific files.

diff --git a/kernel/timer.c b/kernel/timer.c
index b94c6fd8485cfe6376dc9301d26107d983111c29..cabdff7716e7748f021744e03246366e5123534f 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -31,6 +31,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/div64.h>
+#include <asm/timex.h>
 
 /*
  * per-CPU timer vector definitions:
@@ -762,7 +763,9 @@ unsigned long wall_jiffies;
  * This read-write spinlock protects us from races in SMP while
  * playing with xtime and avenrun.
  */
+#ifndef ARCH_HAVE_XTIME_LOCK
 seqlock_t xtime_lock __cacheline_aligned_in_smp = SEQLOCK_UNLOCKED;
+#endif
 unsigned long last_time_offset;
 
 /*