rpms/kernel/F-11 linux-2.6.29-xen-disable-gbpages.patch, 1.2, 1.3 kernel.spec, 1.1689, 1.1690

Kyle McMartin kyle at fedoraproject.org
Mon Aug 10 19:23:30 UTC 2009


Author: kyle

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.29-xen-disable-gbpages.patch 
Log Message:
linux-2.6.29-xen-disable-gbpages.patch

linux-2.6.29-xen-disable-gbpages.patch:
 enlighten.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6.29-xen-disable-gbpages.patch
===================================================================
RCS file: linux-2.6.29-xen-disable-gbpages.patch
diff -N linux-2.6.29-xen-disable-gbpages.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6.29-xen-disable-gbpages.patch	10 Aug 2009 19:23:30 -0000	1.3
@@ -0,0 +1,14 @@
+diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
+index f09e8c3..9a93a7b 100644
+--- a/arch/x86/xen/enlighten.c
++++ b/arch/x86/xen/enlighten.c
+@@ -185,7 +185,8 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
+ 	if (*ax == 1) {
+ 		maskecx = cpuid_leaf1_ecx_mask;
+ 		maskedx = cpuid_leaf1_edx_mask;
+-	}
++	} 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.1689
retrieving revision 1.1690
diff -u -p -r1.1689 -r1.1690
--- kernel.spec	10 Aug 2009 19:11:07 -0000	1.1689
+++ kernel.spec	10 Aug 2009 19:23:30 -0000	1.1690
@@ -689,6 +689,7 @@ Patch11081: linux-2.6-x86-delay-tsc-barr
 Patch12000: linux-2.6-xfrm-export-gc_thresh.patch
 
 Patch13000: linux-2.6-kvm-skip-pit-check.patch
+Patch13001: linux-2.6.29-xen-disable-gbpages.patch
 
 %endif
 
@@ -1262,6 +1263,7 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 ApplyPatch linux-2.6-kvm-skip-pit-check.patch
 
 # xen
+ApplyPatch linux-2.6.29-xen-disable-gbpages.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1853,6 +1855,7 @@ fi
  - linux-2.6-x86-delay-tsc-barrier.patch
  - linux-2.6-fs-cifs-fix-port-numbers.patch
  - linux-2.6-kvm-skip-pit-check.patch
+ - linux-2.6.29-xen-disable-gbpages.patch
 
 * Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
 - Update to released 2.6.30.4.




More information about the fedora-extras-commits mailing list