diff options
| author | Andi Kleen <ak@muc.de> | 2003-02-21 23:56:46 -0800 |
|---|---|---|
| committer | Adam Belay <ambx1@neo.rr.com> | 2003-02-21 23:56:46 -0800 |
| commit | 057de1bbe0a6e60732c04191b6704f34f339fb02 (patch) | |
| tree | 9906f49304f25b61b2d5dfbafef03d4eddc5bcb6 /kernel | |
| parent | 0af95031265eab131a50dea77cfddecc67973dba (diff) | |
[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.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/timer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index b94c6fd8485c..cabdff7716e7 100644 --- 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; /* |