Merge commit 'linux-2.6/master' (early part) into oprofile/core

This branch depends on these apic patches:

      apic, x86: Use BIOS settings for IBS and MCE threshold interrupt LVT offsets
      apic, x86: Check if EILVT APIC registers are available (AMD only)

Signed-off-by: Robert Richter <robert.richter@amd.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c
index fb329e9f8494..d9f4ff8fcd69 100644
--- a/arch/x86/kernel/cpu/perfctr-watchdog.c
+++ b/arch/x86/kernel/cpu/perfctr-watchdog.c
@@ -700,11 +700,10 @@ static void probe_nmi_watchdog(void)
 {
         switch (boot_cpu_data.x86_vendor) {
         case X86_VENDOR_AMD:
-                if (boot_cpu_data.x86 != 6 && boot_cpu_data.x86 != 15 &&
-                    boot_cpu_data.x86 != 16 && boot_cpu_data.x86 != 17)
-                        return;
-                wd_ops = &k7_wd_ops;
-                break;
+                if (boot_cpu_data.x86 == 6 ||
+                    (boot_cpu_data.x86 >= 0xf && boot_cpu_data.x86 <= 0x15))
+                        wd_ops = &k7_wd_ops;
+                return;
         case X86_VENDOR_INTEL:
                 /* Work around where perfctr1 doesn't have a working enable
                  * bit as described in the following errata: