aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/x86/nmi.c
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-03-06 15:30:12 +0100
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-03-06 15:30:12 +0100
commitdf915335060352ec74b8d830b2aee95b1eb31d79 (patch)
tree58ec847ec0a25d6748e406ac7fce32edadc5134d /xen/arch/x86/nmi.c
parent9603c69e65841fe9727a5ec2b87ca42dc4ac11bb (diff)
downloadxen-df915335060352ec74b8d830b2aee95b1eb31d79.tar.gz
xen-df915335060352ec74b8d830b2aee95b1eb31d79.tar.bz2
xen-df915335060352ec74b8d830b2aee95b1eb31d79.zip
Allow NMI watchdog setup on newer P4 processors.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/arch/x86/nmi.c')
-rw-r--r--xen/arch/x86/nmi.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c
index e2a053fe93..0ba9a9e826 100644
--- a/xen/arch/x86/nmi.c
+++ b/xen/arch/x86/nmi.c
@@ -322,15 +322,9 @@ void __pminit setup_apic_nmi_watchdog(void)
case X86_VENDOR_INTEL:
switch (boot_cpu_data.x86) {
case 6:
- if (boot_cpu_data.x86_model > 0xd)
- return;
-
setup_p6_watchdog();
break;
case 15:
- if (boot_cpu_data.x86_model > 0x4)
- return;
-
if (!setup_p4_watchdog())
return;
break;