Rename the misnamed clustered_apic_check

to extended_apic_check because that is what it is now.

Dependent on the earlier physflat32/64 patches.

Index: linux/arch/i386/kernel/acpi/boot.c
===================================================================
--- linux.orig/arch/i386/kernel/acpi/boot.c
+++ linux/arch/i386/kernel/acpi/boot.c
@@ -844,7 +844,7 @@ acpi_process_madt(void)
 				acpi_ioapic = 1;
 
 				smp_found_config = 1;
-				clustered_apic_check();
+				extended_apic_check();
 			}
 		}
 		if (error == -EINVAL) {
Index: linux/include/asm-i386/mach-visws/mach_apic.h
===================================================================
--- linux.orig/include/asm-i386/mach-visws/mach_apic.h
+++ linux/include/asm-i386/mach-visws/mach_apic.h
@@ -47,7 +47,7 @@ static inline void summit_check(char *oe
 {
 }
 
-static inline int clustered_apic_check(void)
+static inline int extended_apic_check(void)
 {
 }
 
Index: linux/include/asm-i386/mach-numaq/mach_apic.h
===================================================================
--- linux.orig/include/asm-i386/mach-numaq/mach_apic.h
+++ linux/include/asm-i386/mach-numaq/mach_apic.h
@@ -34,7 +34,7 @@ static inline void init_apic_ldr(void)
 	/* Already done in NUMA-Q firmware */
 }
 
-static inline int clustered_apic_check(void)
+static inline int extended_apic_check(void)
 {
 	printk("Enabling APIC mode:  %s.  Using %d I/O APICs\n",
 		"NUMA-Q", nr_ioapics);
Index: linux/include/asm-i386/mach-default/mach_apic.h
===================================================================
--- linux.orig/include/asm-i386/mach-default/mach_apic.h
+++ linux/include/asm-i386/mach-default/mach_apic.h
@@ -54,7 +54,7 @@ static inline physid_mask_t ioapic_phys_
 	return phys_map;
 }
 
-static inline int clustered_apic_check(void)
+static inline int extended_apic_check(void)
 {
 	printk("Enabling APIC mode:  %s.  Using %d I/O APICs\n",
 					"Flat", nr_ioapics);
Index: linux/arch/x86_64/kernel/genapic.c
===================================================================
--- linux.orig/arch/x86_64/kernel/genapic.c
+++ linux/arch/x86_64/kernel/genapic.c
@@ -39,7 +39,7 @@ struct genapic *genapic = &apic_flat;
 /*
  * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.
  */
-void __init clustered_apic_check(void)
+void __init extended_apic_check(void)
 {
 	long i;
 	u8 clusters, max_cluster;
Index: linux/arch/i386/kernel/crash.c
===================================================================
--- linux.orig/arch/i386/kernel/crash.c
+++ linux/arch/i386/kernel/crash.c
@@ -162,7 +162,7 @@ static int crash_nmi_callback(struct pt_
 /*
  * By using the NMI code instead of a vector we just sneak thru the
  * word generator coming out with just what we want.  AND it does
- * not matter if clustered_apic_mode is set or not.
+ * not matter if extended_apic_mode is set or not.
  */
 static void smp_send_nmi_allbutself(void)
 {
Index: linux/include/asm-i386/genapic.h
===================================================================
--- linux.orig/include/asm-i386/genapic.h
+++ linux/include/asm-i386/genapic.h
@@ -34,7 +34,7 @@ struct genapic { 
 	void (*init_apic_ldr)(void);
 	physid_mask_t (*ioapic_phys_id_map)(physid_mask_t map);
 
-	int (*clustered_apic_check)(void);
+	int (*extended_apic_check)(void);
 	int (*multi_timer_check)(int apic, int irq);
 	int (*apicid_to_node)(int logical_apicid); 
 	int (*cpu_to_logical_apicid)(int cpu);
@@ -87,7 +87,7 @@ struct genapic { 
 	APICFUNC(check_apicid_present), \
 	APICFUNC(init_apic_ldr), \
 	APICFUNC(ioapic_phys_id_map), \
-	APICFUNC(clustered_apic_check), \
+	APICFUNC(extended_apic_check), \
 	APICFUNC(multi_timer_check), \
 	APICFUNC(apicid_to_node), \
 	APICFUNC(cpu_to_logical_apicid), \
Index: linux/include/asm-i386/mach-summit/mach_apic.h
===================================================================
--- linux.orig/include/asm-i386/mach-summit/mach_apic.h
+++ linux/include/asm-i386/mach-summit/mach_apic.h
@@ -78,7 +78,7 @@ static inline int apic_id_registered(voi
 	return 1;
 }
 
-static inline int clustered_apic_check(void)
+static inline int extended_apic_check(void)
 {
 #ifdef CONFIG_X86_GENERICARCH
 	extern struct genapic apic_summit;
Index: linux/include/asm-i386/mach-bigsmp/mach_apic.h
===================================================================
--- linux.orig/include/asm-i386/mach-bigsmp/mach_apic.h
+++ linux/include/asm-i386/mach-bigsmp/mach_apic.h
@@ -74,7 +74,7 @@ static inline void init_apic_ldr(void)
 	apic_write_around(APIC_LDR, val);
 }
 
-static inline int clustered_apic_check(void)
+static inline int extended_apic_check(void)
 {
 #ifdef CONFIG_X86_GENERICARCH
 	extern struct genapic apic_bigsmp;
Index: linux/arch/x86_64/kernel/mpparse.c
===================================================================
--- linux.orig/arch/x86_64/kernel/mpparse.c
+++ linux/arch/x86_64/kernel/mpparse.c
@@ -346,7 +346,7 @@ static int __init smp_read_mpc(struct mp
 			}
 		}
 	}
-	clustered_apic_check();
+	extended_apic_check();
 	if (!num_processors)
 		printk(KERN_ERR "SMP mptable: no processors registered!\n");
 	return num_processors;
Index: linux/include/asm-i386/mach-es7000/mach_apic.h
===================================================================
--- linux.orig/include/asm-i386/mach-es7000/mach_apic.h
+++ linux/include/asm-i386/mach-es7000/mach_apic.h
@@ -81,7 +81,7 @@ static inline void enable_apic_mode(void
 }
 
 extern int apic_version [MAX_APICS];
-static inline int clustered_apic_check(void)
+static inline int extended_apic_check(void)
 {
 	int apic = bios_cpu_apicid[smp_processor_id()];
 #ifdef CONFIG_X86_GENERICARCH
Index: linux/include/asm-i386/mach-physflat/mach_apic.h
===================================================================
--- linux.orig/include/asm-i386/mach-physflat/mach_apic.h
+++ linux/include/asm-i386/mach-physflat/mach_apic.h
@@ -71,7 +71,7 @@ static inline physid_mask_t ioapic_phys_
 
 extern u8 bios_cpu_apicid[];
 
-static inline int clustered_apic_check(void)
+static inline int extended_apic_check(void)
 {	
 	int i;
 #ifdef CONFIG_X86_PHYSFLAT
Index: linux/include/asm-i386/mach-generic/mach_apic.h
===================================================================
--- linux.orig/include/asm-i386/mach-generic/mach_apic.h
+++ linux/include/asm-i386/mach-generic/mach_apic.h
@@ -13,7 +13,7 @@
 #define apic_id_registered (genapic->apic_id_registered)
 #define init_apic_ldr (genapic->init_apic_ldr)
 #define ioapic_phys_id_map (genapic->ioapic_phys_id_map)
-extern int clustered_apic_check(void);
+extern int extended_apic_check(void);
 #define multi_timer_check (genapic->multi_timer_check)
 #define apicid_to_node (genapic->apicid_to_node)
 #define cpu_to_logical_apicid (genapic->cpu_to_logical_apicid) 
Index: linux/arch/i386/kernel/mpparse.c
===================================================================
--- linux.orig/arch/i386/kernel/mpparse.c
+++ linux/arch/i386/kernel/mpparse.c
@@ -468,7 +468,7 @@ static int __init smp_read_mpc(struct mp
 		}
 		++mpc_record;
 	}
-	clustered_apic_check();
+	extended_apic_check();
 	if (!num_processors)
 		printk(KERN_ERR "SMP mptable: no processors registered!\n");
 	return num_processors;
Index: linux/include/asm-x86_64/apic.h
===================================================================
--- linux.orig/include/asm-x86_64/apic.h
+++ linux/include/asm-x86_64/apic.h
@@ -97,7 +97,7 @@ extern void nmi_watchdog_tick (struct pt
 extern int APIC_init_uniprocessor (void);
 extern void disable_APIC_timer(void);
 extern void enable_APIC_timer(void);
-extern void clustered_apic_check(void);
+extern void extended_apic_check(void);
 
 extern void nmi_watchdog_default(void);
 extern int setup_nmi_watchdog(char *);