diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2009-09-16 03:38:24 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-09-16 05:21:07 -0400 |
commit | 7c423e98856df9b941223a7e7845b2502ad84b00 (patch) | |
tree | cebbbabf8bfa6053fb4d358a2daec29b21114644 /arch | |
parent | 51e0304ce6e55a6e59658558916b4f74da085ff0 (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')
-rw-r--r-- | arch/x86/kernel/cpu/sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/sched.c b/arch/x86/kernel/cpu/sched.c index 6c00a8f3cce5..a640ae5ad201 100644 --- a/arch/x86/kernel/cpu/sched.c +++ b/arch/x86/kernel/cpu/sched.c | |||
@@ -8,11 +8,11 @@ | |||
8 | 8 | ||
9 | #ifdef CONFIG_SMP | 9 | #ifdef CONFIG_SMP |
10 | 10 | ||
11 | static DEFINE_PER_CPU(struct aperfmperf, old_perf); | 11 | static DEFINE_PER_CPU(struct aperfmperf, old_perf_sched); |
12 | 12 | ||
13 | static unsigned long scale_aperfmperf(void) | 13 | static unsigned long scale_aperfmperf(void) |
14 | { | 14 | { |
15 | struct aperfmperf val, *old = &__get_cpu_var(old_perf); | 15 | struct aperfmperf val, *old = &__get_cpu_var(old_perf_sched); |
16 | unsigned long ratio, flags; | 16 | unsigned long ratio, flags; |
17 | 17 | ||
18 | local_irq_save(flags); | 18 | local_irq_save(flags); |