aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2009-09-16 09:38:24 +0200
committerIngo Molnar <mingo@elte.hu>2009-09-16 11:21:07 +0200
commit7c423e98856df9b941223a7e7845b2502ad84b00 (patch)
treecebbbabf8bfa6053fb4d358a2daec29b21114644 /arch/x86
parent51e0304ce6e55a6e59658558916b4f74da085ff0 (diff)
sched: x86: Name old_perf in a unique way
Silly percpu bits don't respect static.. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <new-submission>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/cpu/sched.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/sched.c b/arch/x86/kernel/cpu/sched.c
index 6c00a8f3cce..a640ae5ad20 100644
--- a/arch/x86/kernel/cpu/sched.c
+++ b/arch/x86/kernel/cpu/sched.c
@@ -8,11 +8,11 @@
#ifdef CONFIG_SMP
-static DEFINE_PER_CPU(struct aperfmperf, old_perf);
+static DEFINE_PER_CPU(struct aperfmperf, old_perf_sched);
static unsigned long scale_aperfmperf(void)
{
- struct aperfmperf val, *old = &__get_cpu_var(old_perf);
+ struct aperfmperf val, *old = &__get_cpu_var(old_perf_sched);
unsigned long ratio, flags;
local_irq_save(flags);