aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc/kernel/setup.c')
-rw-r--r--arch/ppc/kernel/setup.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index 1b891b806f3..62022eacf63 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -188,18 +188,18 @@ int show_cpuinfo(struct seq_file *m, void *v)
188 seq_printf(m, "processor\t: %d\n", i); 188 seq_printf(m, "processor\t: %d\n", i);
189 seq_printf(m, "cpu\t\t: "); 189 seq_printf(m, "cpu\t\t: ");
190 190
191 if (cur_cpu_spec[i]->pvr_mask) 191 if (cur_cpu_spec->pvr_mask)
192 seq_printf(m, "%s", cur_cpu_spec[i]->cpu_name); 192 seq_printf(m, "%s", cur_cpu_spec->cpu_name);
193 else 193 else
194 seq_printf(m, "unknown (%08x)", pvr); 194 seq_printf(m, "unknown (%08x)", pvr);
195#ifdef CONFIG_ALTIVEC 195#ifdef CONFIG_ALTIVEC
196 if (cur_cpu_spec[i]->cpu_features & CPU_FTR_ALTIVEC) 196 if (cur_cpu_spec->cpu_features & CPU_FTR_ALTIVEC)
197 seq_printf(m, ", altivec supported"); 197 seq_printf(m, ", altivec supported");
198#endif 198#endif
199 seq_printf(m, "\n"); 199 seq_printf(m, "\n");
200 200
201#ifdef CONFIG_TAU 201#ifdef CONFIG_TAU
202 if (cur_cpu_spec[i]->cpu_features & CPU_FTR_TAU) { 202 if (cur_cpu_spec->cpu_features & CPU_FTR_TAU) {
203#ifdef CONFIG_TAU_AVERAGE 203#ifdef CONFIG_TAU_AVERAGE
204 /* more straightforward, but potentially misleading */ 204 /* more straightforward, but potentially misleading */
205 seq_printf(m, "temperature \t: %u C (uncalibrated)\n", 205 seq_printf(m, "temperature \t: %u C (uncalibrated)\n",
@@ -754,12 +754,12 @@ void __init setup_arch(char **cmdline_p)
754 * for a possibly more accurate value. 754 * for a possibly more accurate value.
755 */ 755 */
756 if (cpu_has_feature(CPU_FTR_SPLIT_ID_CACHE)) { 756 if (cpu_has_feature(CPU_FTR_SPLIT_ID_CACHE)) {
757 dcache_bsize = cur_cpu_spec[0]->dcache_bsize; 757 dcache_bsize = cur_cpu_spec->dcache_bsize;
758 icache_bsize = cur_cpu_spec[0]->icache_bsize; 758 icache_bsize = cur_cpu_spec->icache_bsize;
759 ucache_bsize = 0; 759 ucache_bsize = 0;
760 } else 760 } else
761 ucache_bsize = dcache_bsize = icache_bsize 761 ucache_bsize = dcache_bsize = icache_bsize
762 = cur_cpu_spec[0]->dcache_bsize; 762 = cur_cpu_spec->dcache_bsize;
763 763
764 /* reboot on panic */ 764 /* reboot on panic */
765 panic_timeout = 180; 765 panic_timeout = 180;