[PATCH] ppc64: uniprocessor compile fixes

From: Anton Blanchard <anton@samba.org>

UP compile fixes.

arch/ppc64/kernel/open_pic.c

@@ -76,7 +76,6 @@ static u_int NumSources;
 static int NumISUs;
 static int open_pic_irq_offset;
 static volatile unsigned char* chrp_int_ack_special;
-static int broken_ipi_registers;
 
 OpenPIC_SourcePtr ISU[OPENPIC_MAX_ISU];
 
@@ -248,6 +247,9 @@ static void openpic_safe_writefield(volatile u_int *addr, u_int mask,
 }
 
 #ifdef CONFIG_SMP
+
+static int broken_ipi_registers;
+
 static u_int openpic_read_IPI(volatile u_int* addr)
 {
         u_int val = 0;

arch/ppc64/kernel/prom.c

@@ -930,10 +930,12 @@ prom_hold_cpus(unsigned long mem)
         unsigned long *spinloop     = __v2a(&__secondary_hold_spinloop);
         unsigned long *acknowledge  = __v2a(&__secondary_hold_acknowledge);
         unsigned long secondary_hold = (unsigned long)__v2a(*PTRRELOC((unsigned long *)__secondary_hold));
-        struct naca_struct *_naca = RELOC(naca);
         struct systemcfg *_systemcfg = RELOC(systemcfg);
 	struct paca_struct *_xPaca = PTRRELOC(&paca[0]);
 	struct prom_t *_prom = PTRRELOC(&prom);
+#ifdef CONFIG_SMP
+	struct naca_struct *_naca = RELOC(naca);
+#endif
 
 	/* On pmac, we just fill out the various global bitmasks and
 	 * arrays indicating our CPUs are here, they are actually started
@@ -1103,8 +1105,9 @@ prom_hold_cpus(unsigned long mem)
 			cpu_set(cpuid, RELOC(cpu_online_map));
 			cpu_set(cpuid, RELOC(cpu_present_at_boot));
 		}
-
-	next:
+#endif
+next:
+#ifdef CONFIG_SMP
 		/* Init paca for secondary threads.   They start later. */
 		for (i=1; i < cpu_threads; i++) {
 			cpuid++;

arch/ppc64/mm/init.c

@@ -98,10 +98,12 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur);
 unsigned long pte_freelist_forced_free;
 
+#ifdef CONFIG_SMP
 static void pte_free_smp_sync(void *arg)
 {
 	/* Do nothing, just ensure we sync with all CPUs */
 }
+#endif
 
 /* This is only called when we are critically out of memory
  * (and fail to get a page in pte_free_tlb).

arch/ppc64/xmon/xmon.c

@@ -176,11 +176,9 @@ Commands:\n\
   x	exit monitor\n\
   u	dump segment table or SLB\n\
   ?	help\n"
-#ifndef CONFIG_PPC_ISERIES
   "\
   zr	reboot\n\
   zh	halt\n"
-#endif
 ;
 
 static int xmon_trace[NR_CPUS];
@@ -577,10 +575,8 @@ cmds(struct pt_regs *excp)
 			cpu_cmd();
 			break;
 #endif /* CONFIG_SMP */
-#ifndef CONFIG_PPC_ISERIES
 		case 'z':
 			bootcmds();
-#endif
 		case 'T':
 			debug_trace();
 			break;
@@ -1148,7 +1144,6 @@ super_regs()
 	int cmd;
 	unsigned long val;
 #ifdef CONFIG_PPC_ISERIES
-	int i;
 	struct paca_struct *ptrPaca = NULL;
 	struct ItLpPaca *ptrLpPaca = NULL;
 	struct ItLpRegSave *ptrLpRegSave = NULL;