r2541 - trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches

[Frederik Schüler]

Author: fschueler-guest
Date: 2005-02-24 01:27:48 +0100 (Thu, 24 Feb 2005)
New Revision: 2541

Modified:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/amd64-noexec32-backport.dpatch
Log:
removed duplicate noexec parsing fix from amd64-noexec32-backport.dpatch


Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/amd64-noexec32-backport.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/amd64-noexec32-backport.dpatch	2005-02-23 23:47:17 UTC (rev 2540)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/amd64-noexec32-backport.dpatch	2005-02-24 00:27:48 UTC (rev 2541)
@@ -27,16 +27,7 @@
  asmlinkage long sys_fork(struct pt_regs *regs)
 --- ./arch/x86_64/kernel/setup64.c.orig	2005-02-23 23:58:30.719543925 +0100
 +++ ./arch/x86_64/kernel/setup64.c	2005-02-23 23:59:20.551256256 +0100
-@@ -52,10 +52,10 @@
- */ 
- static int __init nonx_setup(char *str)
- {
--	if (!strcmp(str, "on")) {
-+	if (!strncmp(str, "on", 2)) {
-                 __supported_pte_mask |= _PAGE_NX; 
-  		do_not_nx = 0; 
--	} else if (!strcmp(str, "off")) {
-+	} else if (!strncmp(str, "off", 3)) {
+@@ -59,11 +59,30 @@
  		do_not_nx = 1;
  		__supported_pte_mask &= ~_PAGE_NX;
          }