[PATCH] fix wakeup_secondary_cpu warning, code bloat

Only one of wakeup_secondary_via_NMI() and wakeup_secondary_via_INIT() is
needed.  We're currently compiling both, which generates an unused function
warning.

arch/i386/kernel/smpboot.c

@@ -596,12 +596,14 @@ static inline void inquire_remote_apic(int apicid)
 }
 #endif
 
-static int __init wakeup_secondary_via_NMI(int logical_apicid)
+#ifdef WAKE_SECONDARY_VIA_NMI
 /* 
- * Poke the other CPU in the eye to wake it up. Remember that the normal
+ * Poke the other CPU in the eye via NMI to wake it up. Remember that the normal
  * INIT, INIT, STARTUP sequence will reset the chip hard for us, and this
  * won't ... remember to clear down the APIC, etc later.
  */
+static int __init
+wakeup_secondary_cpu(int logical_apicid, unsigned long start_eip)
 {
 	unsigned long send_status = 0, accept_status = 0;
 	int timeout, maxlvt;
@@ -643,8 +645,11 @@ static int __init wakeup_secondary_via_NMI(int logical_apicid)
 
 	return (send_status | accept_status);
 }
+#endif	/* WAKE_SECONDARY_VIA_NMI */
 
-static int __init wakeup_secondary_via_INIT(int phys_apicid, unsigned long start_eip)
+#ifdef WAKE_SECONDARY_VIA_INIT
+static int __init
+wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip)
 {
 	unsigned long send_status = 0, accept_status = 0;
 	int maxlvt, timeout, num_starts, j;
@@ -766,6 +771,7 @@ static int __init wakeup_secondary_via_INIT(int phys_apicid, unsigned long start
 
 	return (send_status | accept_status);
 }
+#endif	/* WAKE_SECONDARY_VIA_INIT */
 
 extern unsigned long cpu_initialized;
 

include/asm-i386/mach-default/mach_apic.h

@@ -73,8 +73,7 @@ static inline int mpc_apic_id(struct mpc_config_processor *m, int quad)
 	return (m->mpc_apicid);
 }
 
-#define wakeup_secondary_cpu(apicid, start_eip) \
-	wakeup_secondary_via_INIT(apicid, start_eip)
+#define WAKE_SECONDARY_VIA_INIT
 
 static inline void setup_portio_remap(void)
 {

include/asm-i386/mach-numaq/mach_apic.h

@@ -69,8 +69,7 @@ static inline int mpc_apic_id(struct mpc_config_processor *m, int quad)
 	return logical_apicid;
 }
 
-#define wakeup_secondary_cpu(apicid, start_eip) \
-	wakeup_secondary_via_NMI(apicid)
+#define WAKE_SECONDARY_VIA_NMI
 
 static inline void setup_portio_remap(void)
 {

include/asm-i386/mach-summit/mach_apic.h

@@ -54,8 +54,7 @@ static inline unsigned long apicid_to_phys_cpu_present(int apicid)
 		return (1ul << apicid);
 }
 
-#define wakeup_secondary_cpu(apicid, start_eip) \
-	wakeup_secondary_via_INIT(apicid, start_eip)
+#define WAKE_SECONDARY_VIA_INIT
 
 static inline void setup_portio_remap(void)
 {