kernel: Update to 3.7.7.

[people/ms/ipfire-3.x.git] / kernel / patches / linux-3.7-disable-compat_vdso.patch

diff --git a/kernel/patches/linux-2.6.33-disable-compat-vdso.patch b/kernel/patches/linux-3.7-disable-compat_vdso.patch
similarity index 94%
rename from kernel/patches/linux-2.6.33-disable-compat-vdso.patch
rename to kernel/patches/linux-3.7-disable-compat_vdso.patch
index 8716cce9cfa89eec6ec3244edc9246de80abc9c7..c06bd8bf54dd8c846d4ad0ebe01e773053257b8c 100644 (file)
--- a/kernel/patches/linux-2.6.33-disable-compat-vdso.patch
+++ b/kernel/patches/linux-3.7-disable-compat_vdso.patch
@@ -26,13 +26,13 @@ Closes bug: http://bugs.gentoo.org/show_bug.cgi?id=210138
 diff -urp a/arch/x86/Kconfig b/arch/x86/Kconfig
 --- a/arch/x86/Kconfig 2009-07-31 01:36:57.323857684 +0100
 +++ b/arch/x86/Kconfig 2009-07-31 01:51:39.395749681 +0100
-@@ -1607,17 +1607,8 @@
+@@ -1651,17 +1651,8 @@
  
  config COMPAT_VDSO
        def_bool n
 -      prompt "Compat VDSO support"
        depends on X86_32 || IA32_EMULATION
-       depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
+       depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
 -      ---help---
 -        Map the 32-bit VDSO to the predictable old-style address too.
 -