rpms/kernel/F-11 linux-2.6.29-xen-disable-gbpages.patch, NONE, 1.1 kernel.spec, 1.1610, 1.1611

[Justin M. Forbes]

Author: jforbes

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17432

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.29-xen-disable-gbpages.patch 
Log Message:
Disable GB pages for Xen guests BZ# 499592


linux-2.6.29-xen-disable-gbpages.patch:

--- NEW FILE linux-2.6.29-xen-disable-gbpages.patch ---
diff -up linux-2.6.29.noarch/arch/x86/xen/enlighten.c.orig linux-2.6.29.noarch/arch/x86/xen/enlighten.c
--- linux-2.6.29.noarch/arch/x86/xen/enlighten.c.orig	2009-05-18 14:27:53.000000000 +0200
+++ linux-2.6.29.noarch/arch/x86/xen/enlighten.c	2009-05-18 14:32:07.000000000 +0200
@@ -218,6 +218,8 @@ static void xen_cpuid(unsigned int *ax, 
 			    (1 << X86_FEATURE_MCE)  |  /* disable MCE */
 			    (1 << X86_FEATURE_MCA)  |  /* disable MCA */
 			    (1 << X86_FEATURE_ACC));   /* thermal monitoring */
+	else if (*ax == 0x80000001)
+		maskedx = ~((1 << (X86_FEATURE_GBPAGES&31))); /* disable GB pages */
 
 	asm(XEN_EMULATE_PREFIX "cpuid"
 		: "=a" (*ax),


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1610
retrieving revision 1.1611
diff -u -p -r1.1610 -r1.1611
--- kernel.spec	18 May 2009 17:24:24 -0000	1.1610
+++ kernel.spec	18 May 2009 17:43:03 -0000	1.1611
@@ -754,6 +754,7 @@ Patch9303: linux-2.6-kvm-skip-pit-check.
 Patch9304: linux-2.6-xen-check-for-nx-support.patch
 Patch9305: linux-2.6-xen-fix_warning_when_deleting_gendisk.patch
 Patch9306: linux-2.6-xen-xenbus_state_transition_when_not_connected.patch
+Patch9307: linux-2.6.29-xen-disable-gbpages.patch
 
 %endif
 
@@ -1399,6 +1400,7 @@ ApplyPatch linux-2.6-kvm-skip-pit-check.
 ApplyPatch linux-2.6-xen-check-for-nx-support.patch
 ApplyPatch linux-2.6-xen-fix_warning_when_deleting_gendisk.patch
 ApplyPatch linux-2.6-xen-xenbus_state_transition_when_not_connected.patch
+ApplyPatch linux-2.6.29-xen-disable-gbpages.patch
 
 
 # END OF PATCH APPLICATIONS
@@ -1987,6 +1989,9 @@ fi
 # and build.
 
 %changelog
+* Mon May 18 2009 Justin M. Forbes <jforbes at redhat.com>
+- Disable GB pages for Xen guests BZ# 499592
+
 * Mon May 18 2009 Kyle McMartin <kyle at redhat.com>
 - increase-MAX_LOCKDEP_ENTRIES.patch: suck in upstream fix
   d80c19df5fcceb8c741e96f09f275c2da719efef