Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Dec 2013 12:21:01 +0100
From:      Roger Pau Monne <roger.pau@citrix.com>
To:        <freebsd-xen@freebsd.org>, <freebsd-current@freebsd.org>, <xen-devel@lists.xenproject.org>, <gibbs@freebsd.org>, <jhb@freebsd.org>, <kib@freebsd.org>, <julien.grall@citrix.com>
Subject:   [PATCH RFC 12/13] mca: disable cmc enable on Xen PV
Message-ID:  <1387884062-41154-13-git-send-email-roger.pau@citrix.com>
In-Reply-To: <1387884062-41154-1-git-send-email-roger.pau@citrix.com>
References:  <1387884062-41154-1-git-send-email-roger.pau@citrix.com>

next in thread | previous in thread | raw e-mail | index | archive | help
Xen PV guests doesn't have a lapic, so disable the lapic call in mca
initialization.
---
 sys/x86/x86/mca.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c
index f1369cd..e9d2c1d 100644
--- a/sys/x86/x86/mca.c
+++ b/sys/x86/x86/mca.c
@@ -897,7 +897,7 @@ _mca_init(int boot)
 		}
 
 #ifdef DEV_APIC
-		if (PCPU_GET(cmci_mask) != 0 && boot)
+		if (PCPU_GET(cmci_mask) != 0 && boot && !lapic_disabled)
 			lapic_enable_cmc();
 #endif
 	}
-- 
1.7.7.5 (Apple Git-26)




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1387884062-41154-13-git-send-email-roger.pau>