rpms/kernel/devel linux-2.6-execshield.patch,1.66,1.67

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10932

Modified Files:
	linux-2.6-execshield.patch 
Log Message:
build fix

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.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- linux-2.6-execshield.patch	31 Jul 2007 18:25:55 -0000	1.66
+++ linux-2.6-execshield.patch	31 Jul 2007 20:15:44 -0000	1.67
@@ -1315,18 +1315,18 @@
  	KERN_REALROOTDEV=16,	/* real root device to mount after initrd */
  
  	KERN_SPARC_REBOOT=21,	/* reboot command on Sparc */
-Index: linux-2.6/mm/mprotect.c
-===================================================================
---- linux-2.6.orig/mm/mprotect.c
-+++ linux-2.6/mm/mprotect.c
-@@ -23,6 +23,7 @@
- #include <linux/swapops.h>
- #include <asm/uaccess.h>
- #include <asm/pgtable.h>
-+#include <asm/pgalloc.h>
+--- linux-2.6.22.noarch/mm/mprotect.c~	2007-07-31 16:12:27.000000000 -0400
++++ linux-2.6.22.noarch/mm/mprotect.c	2007-07-31 16:14:24.000000000 -0400
+@@ -26,6 +26,9 @@
+ #include <asm/pgalloc.h>
  #include <asm/cacheflush.h>
  #include <asm/tlbflush.h>
++#ifdef CONFIG_X86
++#include <asm/desc.h>
++#endif
  
+ static void change_pte_range(struct mm_struct *mm, pmd_t *pmd,
+ 		unsigned long addr, unsigned long end, pgprot_t newprot,
 @@ -135,7 +136,7 @@ mprotect_fixup(struct vm_area_struct *vm
  	struct mm_struct *mm = vma->vm_mm;
  	unsigned long oldflags = vma->vm_flags;