[PATCH] ppc64: Fix !SMP build

People don't build UP very often it seems ... anyways, it was broken,
here is the fix.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/ppc64/kernel/setup.c

@@ -99,7 +99,7 @@ unsigned long decr_overclock_set = 0;
 unsigned long decr_overclock_proc0_set = 0;
 
 int have_of = 1;
-
+int boot_cpuid = 0;
 dev_t boot_dev;
 
 /*
@@ -713,7 +713,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 #ifdef CONFIG_SMP
 	pvr = per_cpu(pvr, cpu_id);
 #else
-	pvr = mfpvr(PSRN_PVR);
+	pvr = mfspr(SPRN_PVR);
 #endif
 	maj = (pvr >> 8) & 0xFF;
 	min = pvr & 0xFF;

arch/ppc64/kernel/smp.c

@@ -84,7 +84,6 @@ extern long register_vpa(unsigned long flags, unsigned long proc,
 			 unsigned long vpa);
 
 int smt_enabled_at_boot = 1;
-int boot_cpuid = 0;
 
 /* Low level assembly function used to backup CPU 0 state */
 extern void __save_cpu_setup(void);

include/asm-ppc64/smp.h

@@ -26,6 +26,8 @@
 
 #include <asm/paca.h>
 
+extern int boot_cpuid;
+
 #ifdef CONFIG_SMP
 
 extern void smp_send_debugger_break(int cpu);
@@ -37,7 +39,6 @@ extern void smp_message_recv(int, struct pt_regs *);
 #define hard_smp_processor_id() (get_paca()->hw_cpu_id)
 
 extern cpumask_t cpu_sibling_map[NR_CPUS];
-extern int boot_cpuid;
 
 /* Since OpenPIC has only 4 IPIs, we use slightly different message numbers.
  *