summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-02 15:06:22 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-02 15:06:22 +1100
commitbccfd588423bb610fb1fde987da3ad23af1c46d7 (patch)
tree79ecbb819425d4680991ddd890bb30d526c77882 /arch
parent19fa17e5b1d9622902c1e9a7b0f8be676f266bbe (diff)
downloadop-kernel-dev-bccfd588423bb610fb1fde987da3ad23af1c46d7.zip
op-kernel-dev-bccfd588423bb610fb1fde987da3ad23af1c46d7.tar.gz
powerpc: Fix compile error with CONFIG_TAU=y
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/setup-common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 1292460..14ebe3b 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -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",
- cpu_temp(i));
+ cpu_temp(cpu_id));
#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
OpenPOWER on IntegriCloud