packages (LINUX_2_6_27): kernel/linux-2.6-grsec_full.patch - fix duplicate ...

[glen]

Author: glen                         Date: Fri Mar 16 17:33:17 2012 GMT
Module: packages                      Tag: LINUX_2_6_27
---- Log message:
- fix duplicate __ksymtab_PAGE_SHARED symbol on sparc (it is identical to PAGE_SHARED_NOEXEC if CONFIG_PAX_PAGEEXEC is not defined)

---- Files affected:
packages/kernel:
   linux-2.6-grsec_full.patch (1.1.2.51.2.11 -> 1.1.2.51.2.12) 

---- Diffs:

================================================================
Index: packages/kernel/linux-2.6-grsec_full.patch
diff -u packages/kernel/linux-2.6-grsec_full.patch:1.1.2.51.2.11 packages/kernel/linux-2.6-grsec_full.patch:1.1.2.51.2.12
--- packages/kernel/linux-2.6-grsec_full.patch:1.1.2.51.2.11	Thu Mar 15 07:47:40 2012
+++ packages/kernel/linux-2.6-grsec_full.patch	Fri Mar 16 18:33:10 2012
@@ -2276,15 +2276,16 @@
  		/* Allow reads even for write-only mappings */
  		if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
  			goto bad_area;
-diff -urNp linux-2.6.27.10/arch/sparc/mm/init.c linux-2.6.27.10/arch/sparc/mm/init.c
---- linux-2.6.27.10/arch/sparc/mm/init.c	2008-11-07 12:55:34.000000000 -0500
-+++ linux-2.6.27.10/arch/sparc/mm/init.c	2008-11-18 03:38:43.000000000 -0500
-@@ -312,6 +312,9 @@ extern void device_scan(void);
+--- linux-2.6.27.10/arch/sparc/mm/init.c	2008-11-18 03:38:43.000000000 -0500
++++ kernel-2.6.27.46/arch/sparc/mm/init.c	2010-05-09 00:00:07.000000000 +0000
+@@ -312,6 +312,11 @@
  pgprot_t PAGE_SHARED __read_mostly;
  EXPORT_SYMBOL(PAGE_SHARED);
  
++#ifdef CONFIG_PAX_PAGEEXEC
 +pgprot_t PAGE_SHARED_NOEXEC __read_mostly;
 +EXPORT_SYMBOL(PAGE_SHARED_NOEXEC);
++#endif
 +
  void __init paging_init(void)
  {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/linux-2.6-grsec_full.patch?r1=1.1.2.51.2.11&r2=1.1.2.51.2.12&f=u