[tip:sched/core] sched: x86: Name old_perf in a unique way

From: tip-bot for Peter Zijlstra
Date: Wed Sep 16 2009 - 06:25:58 EST


Commit-ID: 7c423e98856df9b941223a7e7845b2502ad84b00
Gitweb: http://git.kernel.org/tip/7c423e98856df9b941223a7e7845b2502ad84b00
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
AuthorDate: Wed, 16 Sep 2009 09:38:24 +0200
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Wed, 16 Sep 2009 11:21:07 +0200

sched: x86: Name old_perf in a unique way

Silly percpu bits don't respect static..

Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <new-submission>


---
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 6c00a8f..a640ae5 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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/