diff -urNp x-ref/arch/i386/kernel/apic.c x/arch/i386/kernel/apic.c
--- x-ref/arch/i386/kernel/apic.c	Mon Sep 30 03:12:53 2002
+++ x/arch/i386/kernel/apic.c	Mon Sep 30 03:14:08 2002
@@ -598,7 +598,7 @@ static int __init detect_init_APIC (void
 
 	switch (boot_cpu_data.x86_vendor) {
 	case X86_VENDOR_AMD:
-		if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model > 1)
+		if (boot_cpu_data.x86 >= 6 && boot_cpu_data.x86_model > 1)
 			break;
 		goto no_apic;
 	case X86_VENDOR_INTEL:
diff -urNp x-ref/arch/i386/kernel/nmi.c x/arch/i386/kernel/nmi.c
--- x-ref/arch/i386/kernel/nmi.c	Mon Sep 30 03:13:09 2002
+++ x/arch/i386/kernel/nmi.c	Mon Sep 30 03:14:08 2002
@@ -133,7 +133,7 @@ static int __init setup_nmi_watchdog(cha
 		nmi_watchdog = nmi;
 	if ((nmi == NMI_LOCAL_APIC) &&
 			(boot_cpu_data.x86_vendor == X86_VENDOR_AMD) &&
-			(boot_cpu_data.x86 == 6))
+			(boot_cpu_data.x86 >= 6))
 		nmi_watchdog = nmi;
 	/*
 	 * We can enable the IO-APIC watchdog