From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: Re: [PATCH 8/8] kvm-kmod: x86: Add MCE compat defines Date: Tue, 26 May 2009 14:43:30 +0200 Message-ID: <4A1BE3F2.9010400@siemens.com> References: <20090526115251.3362.54734.stgit@mchn012c.ww002.siemens.net> <20090526115252.3362.67189.stgit@mchn012c.ww002.siemens.net> <4A1BDBBE.6060106@redhat.com> 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 gecko.sbs.de ([194.138.37.40]:22790 "EHLO gecko.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754789AbZEZMnq (ORCPT ); Tue, 26 May 2009 08:43:46 -0400 In-Reply-To: <4A1BDBBE.6060106@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Avi Kivity wrote: > Jan Kiszka wrote: >> Signed-off-by: Jan Kiszka >> --- >> >> x86/external-module-compat.h | 8 ++++++++ >> 1 files changed, 8 insertions(+), 0 deletions(-) >> >> diff --git a/x86/external-module-compat.h b/x86/external-module-compat.h >> index c33eb2e..cc984ab 100644 >> --- a/x86/external-module-compat.h >> +++ b/x86/external-module-compat.h >> @@ -540,3 +540,11 @@ struct mtrr_state_type { >> #ifndef CONFIG_HAVE_KVM_IRQCHIP >> #define CONFIG_HAVE_KVM_IRQCHIP 1 >> #endif >> + >> +#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 >> >> > > This breaks on recent kernels (redefinition), so I removed it. Suggest > adding an include-compat/asm-x86/asm/mce.h and including that. Non-empty mce.h will not work (but a patch to add an empty one was missing from my queue) - new kernel have that file, but with improper definitions for 32-bit. But what was that recent kernel and what was the precise problem? ATM I could only imagine that the block above is included before original mce.h, right? Then adding an explicit include here should cure the problem. Jan -- Siemens AG, Corporate Technology, CT SE 2 Corporate Competence Center Embedded Linux