This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / Documentation / x86_64 / boot-options.txt

diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index d126070..7f8570a 100644 (file)
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -87,8 +87,22 @@ Non Executable Mappings
 
   noexec=on|off
 
-  on      Enable(default)
+  on      Enable
   off     Disable
+  noforce (default) Don't enable by default for heap/stack/data,
+          but allow PROT_EXEC to be effective
+
+  noexec32=opt{,opt}
+
+  Control the no exec default for 32bit processes.
+  Requires noexec=on or noexec=noforce to be effective.
+
+  Valid options:
+     all,on    Heap,stack,data is non executable.
+     off       (default) Heap,stack,data is executable
+     stack     Stack is non executable, heap/data is.
+     force     Don't imply PROT_EXEC for PROT_READ
+     compat    (default) Imply PROT_EXEC for PROT_READ
 
 SMP