rpms/kernel/devel TODO, 1.16, 1.17 kernel.spec, 1.1041, 1.1042 linux-2.6-execshield.patch, 1.96, 1.97 linux-2.6-xen-execshield-fix-endless-gpf-fault-loop.patch, 1.1, NONE

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22716

Modified Files:
	TODO kernel.spec linux-2.6-execshield.patch 
Removed Files:
	linux-2.6-xen-execshield-fix-endless-gpf-fault-loop.patch 
Log Message:
Kill off one of the xen patches by rolling it into execshield.

(Also unbreak the build from my previous commit that killed COPYING.modules)



Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TODO	10 Oct 2008 19:16:07 -0000	1.16
+++ TODO	10 Oct 2008 19:46:18 -0000	1.17
@@ -101,7 +101,6 @@
 linux-2.6-execshield.patch
 	Not interesting to upstream.
 linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch
-linux-2.6-xen-execshield-fix-endless-gpf-fault-loop.patch
 linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch
 	The xen port of execshield.
 	Is this really worth keeping?  Hopefully most (all?) people


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1041
retrieving revision 1.1042
diff -u -r1.1041 -r1.1042
--- kernel.spec	10 Oct 2008 19:14:17 -0000	1.1041
+++ kernel.spec	10 Oct 2008 19:46:18 -0000	1.1042
@@ -493,7 +493,6 @@
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
 
-Source10: COPYING.modules
 Source11: genkey
 Source14: find-provides
 Source15: merge.pl
@@ -595,7 +594,6 @@
 
 Patch160: linux-2.6-execshield.patch
 Patch161: linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch
-Patch162: linux-2.6-xen-execshield-fix-endless-gpf-fault-loop.patch
 Patch163: linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch
 Patch250: linux-2.6-debug-sizeof-structs.patch
 Patch260: linux-2.6-debug-nmi-timeout.patch
@@ -1084,7 +1082,7 @@
 #
 ApplyPatch linux-2.6-execshield.patch
 ApplyPatch linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch
-ApplyPatch linux-2.6-xen-execshield-fix-endless-gpf-fault-loop.patch
+
 ApplyPatch linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch
 
 #
@@ -1249,8 +1247,6 @@
 
 chmod +x scripts/checkpatch.pl
 
-cp %{SOURCE10} Documentation/
-
 # only deal with configs if we are going to build for the arch
 %ifnarch %nobuildarches
 

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- linux-2.6-execshield.patch	5 Aug 2008 03:08:49 -0000	1.96
+++ linux-2.6-execshield.patch	10 Oct 2008 19:46:18 -0000	1.97
@@ -101,7 +101,7 @@
  		goto out;
 --- linux-2.6.26.noarch/arch/x86/kernel/traps_32.c~	2008-07-14 20:20:15.000000000 -0400
 +++ linux-2.6.26.noarch/arch/x86/kernel/traps_32.c	2008-07-14 20:26:18.000000000 -0400
-@@ -596,7 +596,90 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv
+@@ -596,7 +596,91 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv
  DO_ERROR(11, SIGBUS, "segment not present", segment_not_present)
  DO_ERROR(12, SIGBUS, "stack segment", stack_segment)
  DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)
@@ -143,7 +143,8 @@
 +	desc1 = &current->mm->context.user_cs;
 +	desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS;
 +
-+	if (desc1->a != desc2->a || desc1->b != desc2->b) {
++	if ((desc1->a & 0xff0000ff) != (desc2->a & 0xff0000ff) ||
++	    desc1->b != desc2->b) {
 +		/*
 +		 * The CS was not in sync - reload it and retry the
 +		 * instruction. If the instruction still faults then


--- linux-2.6-xen-execshield-fix-endless-gpf-fault-loop.patch DELETED ---