From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH v2] kvm-kmod: x86: Add MCE compat defines Date: Tue, 26 May 2009 15:47:45 +0200 Message-ID: <4A1BF301.309@siemens.com> References: <20090526115251.3362.54734.stgit@mchn012c.ww002.siemens.net> <20090526115252.3362.67189.stgit@mchn012c.ww002.siemens.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: Avi Kivity Return-path: Received: from lizzard.sbs.de ([194.138.37.39]:19603 "EHLO lizzard.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751044AbZEZNsA (ORCPT ); Tue, 26 May 2009 09:48:00 -0400 In-Reply-To: <20090526115252.3362.67189.stgit@mchn012c.ww002.siemens.net> Sender: kvm-owner@vger.kernel.org List-ID: Changes in v2: - added empty mce.h for 32-bit kernels - fixed redefinition issue by pulling in mce.h early Signed-off-by: Jan Kiszka --- include-compat/asm-x86/mce.h | 1 + x86/external-module-compat.h | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) create mode 100644 include-compat/asm-x86/mce.h diff --git a/include-compat/asm-x86/mce.h b/include-compat/asm-x86/mce.h new file mode 100644 index 0000000..1eb03c6 --- /dev/null +++ b/include-compat/asm-x86/mce.h @@ -0,0 +1 @@ +/* empty file to keep #include happy */ diff --git a/x86/external-module-compat.h b/x86/external-module-compat.h index c33eb2e..5add5c9 100644 --- a/x86/external-module-compat.h +++ b/x86/external-module-compat.h @@ -540,3 +540,13 @@ struct mtrr_state_type { #ifndef CONFIG_HAVE_KVM_IRQCHIP #define CONFIG_HAVE_KVM_IRQCHIP 1 #endif + +#include + +#ifndef MCG_CTL_P +#define MCG_CTL_P (1ULL<<8) +#define MCG_STATUS_MCIP (1ULL<<2) +#define MCI_STATUS_VAL (1ULL<<63) +#define MCI_STATUS_OVER (1ULL<<62) +#define MCI_STATUS_UC (1ULL<<61) +#endif