diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:06:22 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:06:22 -0500 |
commit | bccfd588423bb610fb1fde987da3ad23af1c46d7 (patch) | |
tree | 79ecbb819425d4680991ddd890bb30d526c77882 | |
parent | 19fa17e5b1d9622902c1e9a7b0f8be676f266bbe (diff) |
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>
-rw-r--r-- | arch/powerpc/kernel/setup-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 1292460fcde2..14ebe3bc48c3 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) | |||
201 | #ifdef CONFIG_TAU_AVERAGE | 201 | #ifdef CONFIG_TAU_AVERAGE |
202 | /* more straightforward, but potentially misleading */ | 202 | /* more straightforward, but potentially misleading */ |
203 | seq_printf(m, "temperature \t: %u C (uncalibrated)\n", | 203 | seq_printf(m, "temperature \t: %u C (uncalibrated)\n", |
204 | cpu_temp(i)); | 204 | cpu_temp(cpu_id)); |
205 | #else | 205 | #else |
206 | /* show the actual temp sensor range */ | 206 | /* show the actual temp sensor range */ |
207 | u32 temp; | 207 | u32 temp; |
208 | temp = cpu_temp_both(i); | 208 | temp = cpu_temp_both(cpu_id); |
209 | seq_printf(m, "temperature \t: %u-%u C (uncalibrated)\n", | 209 | seq_printf(m, "temperature \t: %u-%u C (uncalibrated)\n", |
210 | temp & 0xff, temp >> 16); | 210 | temp & 0xff, temp >> 16); |
211 | #endif | 211 | #endif |