ppc64: UP compile fixes

arch/ppc64/kernel/head.S

@@ -1565,7 +1565,6 @@ _GLOBAL(__secondary_start)
 	mtspr	SRR0,r3
 	mtspr	SRR1,r4
 	rfid
-#endif /* CONFIG_SMP */
 
 /* 
  * Running with relocation on at this point.  All we want to do is
@@ -1575,6 +1574,7 @@ _GLOBAL(start_secondary_prolog)
 	li	r3,0
 	std	r3,0(r1)                /* Zero the stack frame pointer     */
 	bl	.start_secondary
+#endif
 
 /*
  * This subroutine clobbers r11, r12 and the LR

arch/ppc64/kernel/prom.c

@@ -180,6 +180,8 @@ struct _of_tce_table of_tce_table[MAX_PHB + 1] = {{0, 0, 0}};
 char *bootpath = 0;
 char *bootdevice = 0;
 
+int boot_cpuid = 0;
+
 struct device_node *allnodes = 0;
 
 #define UNDEFINED_IRQ 0xffff
@@ -1350,7 +1352,9 @@ prom_init(unsigned long r3, unsigned long r4, unsigned long pp,
 		&getprop_rval, sizeof(getprop_rval));
 	_prom->cpu = (int)(unsigned long)getprop_rval;
 	_xPaca[_prom->cpu].active = 1;
+#ifdef CONFIG_SMP
 	RELOC(cpu_online_map) = 1 << _prom->cpu;
+#endif
 	RELOC(boot_cpuid) = _prom->cpu;
 
 #ifdef DEBUG_PROM

arch/ppc64/kernel/setup.c

@@ -262,7 +262,6 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 	unsigned short maj;
 	unsigned short min;
 
-#ifdef CONFIG_SMP
 	if (cpu_id == NR_CPUS) {
 
 		if (ppc_md.get_cpuinfo != NULL)
@@ -273,17 +272,18 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 
 	if (!(cpu_online_map & (1<<cpu_id)))
 		return 0;
-#endif
 
+#ifdef CONFIG_SMP
 	pvr = paca[cpu_id].pvr;
+#else
+	pvr = _get_PVR();
+#endif
 	maj = (pvr >> 8) & 0xFF;
 	min = pvr & 0xFF;
 
 	seq_printf(m, "processor\t: %lu\n", cpu_id);
 	seq_printf(m, "cpu\t\t: ");
 
-	pvr = paca[cpu_id].pvr;
-
 	switch (PVR_VER(pvr)) {
 	case PV_NORTHSTAR:
 		seq_printf(m, "RS64-II (northstar)\n");

arch/ppc64/kernel/smp.c

@@ -55,7 +55,6 @@ unsigned long cache_decay_ticks;
 
 /* initialised so it doesnt end up in bss */
 unsigned long cpu_online_map = 0;
-int boot_cpuid = 0;
 
 static struct smp_ops_t *smp_ops;
 

include/asm-ppc64/prom.h

@@ -172,6 +172,8 @@ struct prom_t {
 
 extern struct prom_t prom;
 
+extern int boot_cpuid;
+
 /* Prototypes */
 extern void abort(void);
 extern unsigned long prom_init(unsigned long, unsigned long, unsigned long,

include/asm-ppc64/smp.h

@@ -56,8 +56,6 @@ extern volatile unsigned long cpu_callin_map[NR_CPUS];
 
 #define smp_processor_id() (get_paca()->xPacaIndex)
 
-extern int boot_cpuid;
-
 /* Since OpenPIC has only 4 IPIs, we use slightly different message numbers.
  *
  * Make sure this matches openpic_request_IPIs in open_pic.c, or what shows up