Commit 057de1bb authored by Andi Kleen's avatar Andi Kleen Committed by Adam Belay

[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.
parent 0af95031
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/div64.h> #include <asm/div64.h>
#include <asm/timex.h>
/* /*
* per-CPU timer vector definitions: * per-CPU timer vector definitions:
...@@ -762,7 +763,9 @@ unsigned long wall_jiffies; ...@@ -762,7 +763,9 @@ unsigned long wall_jiffies;
* This read-write spinlock protects us from races in SMP while * This read-write spinlock protects us from races in SMP while
* playing with xtime and avenrun. * playing with xtime and avenrun.
*/ */
#ifndef ARCH_HAVE_XTIME_LOCK
seqlock_t xtime_lock __cacheline_aligned_in_smp = SEQLOCK_UNLOCKED; seqlock_t xtime_lock __cacheline_aligned_in_smp = SEQLOCK_UNLOCKED;
#endif
unsigned long last_time_offset; unsigned long last_time_offset;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment