[PATCH] apic: make mach_default compile again

While sweeping the APIC code two points were missed.  The first is getting
the definition of BAD_APICID available to
include/asm-i386/mach-default/mach_apic.h by #including the right header,
and the second is UP local APIC without UP IO-APIC linking in
get_broadcast_physid().
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/i386/kernel/apic.c

@@ -80,6 +80,17 @@ void enable_NMI_through_LVT0 (void * dummy)
 	apic_write_around(APIC_LVT0, v);
 }
 
+int get_physical_broadcast(void)
+{
+	unsigned int lvr, version;
+	lvr = apic_read(APIC_LVR);
+	version = GET_APIC_VERSION(lvr);
+	if (version >= 0x14)
+		return 0xff;
+	else
+		return 0xf;
+}
+
 int get_maxlvt(void)
 {
 	unsigned int v, ver, maxlvt;

arch/i386/kernel/io_apic.c

@@ -722,17 +722,6 @@ static int __init ioapic_pirq_setup(char *str)
 
 __setup("pirq=", ioapic_pirq_setup);
 
-int get_physical_broadcast(void)
-{
-	unsigned int lvr, version;
-	lvr = apic_read(APIC_LVR);
-	version = GET_APIC_VERSION(lvr);
-	if (version >= 0x14)
-		return 0xff;
-	else
-		return 0xf;
-}
-
 /*
  * Find the IRQ entry number of a certain pin.
  */

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

@@ -2,6 +2,7 @@
 #define __ASM_MACH_APIC_H
 
 #include <mach_apicdef.h>
+#include <asm/smp.h>
 
 #define APIC_DFR_VALUE	(APIC_DFR_FLAT)