diff options
| author | Keir Fraser <keir@xensource.com> | 2007-10-11 12:11:54 +0100 |
|---|---|---|
| committer | Keir Fraser <keir@xensource.com> | 2007-10-11 12:11:54 +0100 |
| commit | 3f497f56cc1e0d7353cd564abafe5567236fd353 (patch) | |
| tree | 5dd9bb98da5db1bb2593b189b000efe22bd1f769 /xen/arch/x86/nmi.c | |
| parent | 6190bfce75e8949838d0bc08efaa0f9cfad4b1ad (diff) | |
| download | xen-3f497f56cc1e0d7353cd564abafe5567236fd353.tar.gz xen-3f497f56cc1e0d7353cd564abafe5567236fd353.tar.bz2 xen-3f497f56cc1e0d7353cd564abafe5567236fd353.zip | |
x86: AMD Fam10/11 adjustments
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Sync up affected files with 2.6.23-rc9.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/arch/x86/nmi.c')
| -rw-r--r-- | xen/arch/x86/nmi.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index 2bf72d1f8f..ad83f8beb3 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -314,9 +314,14 @@ void __pminit setup_apic_nmi_watchdog(void) switch (boot_cpu_data.x86_vendor) { case X86_VENDOR_AMD: - if (boot_cpu_data.x86 != 6 && boot_cpu_data.x86 != 15) + switch (boot_cpu_data.x86) { + case 6: + case 15 ... 17: + setup_k7_watchdog(); + break; + default: return; - setup_k7_watchdog(); + } break; case X86_VENDOR_INTEL: switch (boot_cpu_data.x86) { |