diff options
| author |   Andi Kleen <ak@linux.intel.com> | 2014-02-08 08:51:59 +0100 |
|---|---|---|
| committer |   H. Peter Anvin <hpa@linux.intel.com> | 2014-02-13 18:12:09 -0800 |
| commit | 40747ffa5aa8d5b99ca46c696234b9194b59e0ac (patch) | |
| tree | 7ca377000699d37e291affa81f56b8e973248104 | |
| parent | asmlinkage: Make __iowrite32_copy visible (diff) | |
| download | linux-dev-40747ffa5aa8d5b99ca46c696234b9194b59e0ac.tar.xz linux-dev-40747ffa5aa8d5b99ca46c696234b9194b59e0ac.zip | |
asmlinkage: Make jiffies visible
Jiffies is referenced by the linker script, so it has to be visible.
Handled both the generic and the x86 version.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1391845930-28580-3-git-send-email-ak@linux.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| -rw-r--r-- | arch/x86/kernel/time.c | 2 | ||||
| -rw-r--r-- | kernel/timer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c index 24d3c91e9812..6ec91c00d84d 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 -DEFINE_VVAR(volatile unsigned long, jiffies) = INITIAL_JIFFIES; +__visible DEFINE_VVAR(volatile unsigned long, jiffies) = INITIAL_JIFFIES; #endif unsigned long profile_pc(struct pt_regs *regs) diff --git a/kernel/timer.c b/kernel/timer.c index accfd241b9e5..d78de047599b 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -52,7 +52,7 @@ #define CREATE_TRACE_POINTS #include <trace/events/timer.h> -u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES; +__visible u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES; EXPORT_SYMBOL(jiffies_64); |