From: Gerd Knorr Subject: [patch merge tree] fixup mtrr kernel config Date: Wed, 07 Dec 2005 17:50:15 +0100 Message-ID: <439712C7.60807@suse.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------010500020906040103090309" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel Cc: Jan Beulich List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------010500020906040103090309 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, The attached patch fixes the mtrr kernel config in the merge tree. Without that patch mtrr is disabled for non-xen kernel builds. cheers, Gerd --------------010500020906040103090309 Content-Type: text/plain; name="xen3-fixup-mtrr-kconfig" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="xen3-fixup-mtrr-kconfig" Subject: Fix mtrr kconfig for non-xen kernels From: kraxel@suse.de Index: linux-2.6.14/arch/i386/Kconfig =================================================================== --- linux-2.6.14.orig/arch/i386/Kconfig 2005-12-07 16:26:12.000000000 +0100 +++ linux-2.6.14/arch/i386/Kconfig 2005-12-07 17:30:36.000000000 +0100 @@ -616,7 +616,7 @@ config MATH_EMULATION config MTRR bool "MTRR (Memory Type Range Register) support" - depends on XEN_PRIVILEGED_GUEST + depends on (XEN_PRIVILEGED_GUEST || !X86_XEN) default y if X86_XEN ---help--- On Intel P6 family processors (Pentium Pro, Pentium II and later) --------------010500020906040103090309 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------010500020906040103090309--