]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
powerpc: Fix compile error with CONFIG_TAU=y
authorPaul Mackerras <paulus@samba.org>
Wed, 2 Nov 2005 04:06:22 +0000 (15:06 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 2 Nov 2005 04:06:22 +0000 (15:06 +1100)
A couple of instances of "i" that needed to be changed to "cpu_id"
got missed in the merge, because they were in CONFIG_TAU code.

Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/setup-common.c

index 1292460fcde26cb70049c7da3f06c63085a1dd64..14ebe3bc48c3e7e5621601180d55e5568f4437f4 100644 (file)
@@ -201,11 +201,11 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 #ifdef CONFIG_TAU_AVERAGE
                /* more straightforward, but potentially misleading */
                seq_printf(m,  "temperature \t: %u C (uncalibrated)\n",
 #ifdef CONFIG_TAU_AVERAGE
                /* more straightforward, but potentially misleading */
                seq_printf(m,  "temperature \t: %u C (uncalibrated)\n",
-                          cpu_temp(i));
+                          cpu_temp(cpu_id));
 #else
                /* show the actual temp sensor range */
                u32 temp;
 #else
                /* show the actual temp sensor range */
                u32 temp;
-               temp = cpu_temp_both(i);
+               temp = cpu_temp_both(cpu_id);
                seq_printf(m, "temperature \t: %u-%u C (uncalibrated)\n",
                           temp & 0xff, temp >> 16);
 #endif
                seq_printf(m, "temperature \t: %u-%u C (uncalibrated)\n",
                           temp & 0xff, temp >> 16);
 #endif