---

yaml --- r: 163018 b: refs/heads/master c: 7c423e9 h: refs/heads/master v: v3
git-mirror · Sep 16, 2009 · ff09e1b · ff09e1b
1 parent f3ed5c1
commit ff09e1b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);