From ff09e1bd141cfe9c59fa287c7a26fb899581e029 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 16 Sep 2009 09:38:24 +0200 Subject: [PATCH] --- yaml --- r: 163018 b: refs/heads/master c: 7c423e98856df9b941223a7e7845b2502ad84b00 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/sched.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4a70c4d979a3..343731416e1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51e0304ce6e55a6e59658558916b4f74da085ff0 +refs/heads/master: 7c423e98856df9b941223a7e7845b2502ad84b00 diff --git a/trunk/arch/x86/kernel/cpu/sched.c b/trunk/arch/x86/kernel/cpu/sched.c index 6c00a8f3cce5..a640ae5ad201 100644 --- a/trunk/arch/x86/kernel/cpu/sched.c +++ b/trunk/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);