Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bccfd588 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

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: default avatarPaul Mackerras <paulus@samba.org>
parent 19fa17e5

arch/powerpc/kernel/setup-common.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -201,11 +201,11 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
#ifdef CONFIG_TAU_AVERAGE

#ifdef CONFIG_TAU_AVERAGE

		/* more straightforward, but potentially misleading */

		/* more straightforward, but potentially misleading */

		seq_printf(m,  "temperature \t: %u C (uncalibrated)\n",

		seq_printf(m,  "temperature \t: %u C (uncalibrated)\n",

			   cpu_temp(i));

			   cpu_temp(cpu_id));

#else

#else

		/* show the actual temp sensor range */

		/* show the actual temp sensor range */

		u32 temp;

		u32 temp;

		temp = cpu_temp_both(i);

		temp = cpu_temp_both(cpu_id);

		seq_printf(m, "temperature \t: %u-%u C (uncalibrated)\n",

		seq_printf(m, "temperature \t: %u-%u C (uncalibrated)\n",

			   temp & 0xff, temp >> 16);

			   temp & 0xff, temp >> 16);

#endif

#endif