diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 12:19:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 12:19:31 -0700 |
| commit | 14587a2a25447813996e6fb9e48d48627cb75a5d (patch) | |
| tree | fb2a16f31297a8e85a1f6678231d50e2d389a1a0 /arch/x86/kernel/time.c | |
| parent | fce637e392a762e4d4f0fc41ac3d3f557187ac21 (diff) | |
| parent | e9d35946c84c44e33e007123d3d595ccbd21d1a4 (diff) | |
| download | blackbird-op-linux-14587a2a25447813996e6fb9e48d48627cb75a5d.tar.gz blackbird-op-linux-14587a2a25447813996e6fb9e48d48627cb75a5d.zip | |
Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* '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
Diffstat (limited to 'arch/x86/kernel/time.c')
| -rw-r--r-- | arch/x86/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c index 25a28a245937..00cbb272627f 100644 --- a/arch/x86/kernel/time.c +++ b/arch/x86/kernel/time.c @@ -23,7 +23,7 @@ #include <asm/time.h> #ifdef CONFIG_X86_64 -volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES; +DEFINE_VVAR(volatile unsigned long, jiffies) = INITIAL_JIFFIES; #endif unsigned long profile_pc(struct pt_regs *regs) |
