From: James Cleverdon <jamesclv@us.ibm.com>



Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/arch/x86_64/kernel/mpparse.c |    1 +
 25-akpm/include/asm-x86_64/apic.h    |    1 +
 2 files changed, 2 insertions(+)

diff -puN arch/x86_64/kernel/mpparse.c~x86-64-clustered-apic-support-fix-fix-fix arch/x86_64/kernel/mpparse.c
--- 25/arch/x86_64/kernel/mpparse.c~x86-64-clustered-apic-support-fix-fix-fix	Thu Oct  7 14:26:45 2004
+++ 25-akpm/arch/x86_64/kernel/mpparse.c	Thu Oct  7 14:26:45 2004
@@ -330,6 +330,7 @@ static int __init smp_read_mpc(struct mp
 			}
 		}
 	}
+	clustered_apic_check();
 	if (!num_processors)
 		printk(KERN_ERR "SMP mptable: no processors registered!\n");
 	return num_processors;
diff -puN include/asm-x86_64/apic.h~x86-64-clustered-apic-support-fix-fix-fix include/asm-x86_64/apic.h
--- 25/include/asm-x86_64/apic.h~x86-64-clustered-apic-support-fix-fix-fix	Thu Oct  7 14:26:45 2004
+++ 25-akpm/include/asm-x86_64/apic.h	Thu Oct  7 14:26:45 2004
@@ -97,6 +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 int check_nmi_watchdog(void);
 extern void nmi_watchdog_default(void);
_