

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/Documentation/kernel-parameters.txt |    4 ++++
 1 files changed, 4 insertions(+)

diff -puN Documentation/kernel-parameters.txt~noexec-kernel-parameters-update Documentation/kernel-parameters.txt
--- 25/Documentation/kernel-parameters.txt~noexec-kernel-parameters-update	2004-07-06 20:29:42.878052552 -0700
+++ 25-akpm/Documentation/kernel-parameters.txt	2004-07-06 20:30:36.380918880 -0700
@@ -719,6 +719,10 @@ running once the system is up.
 
 	noexec		[IA-64]
 
+	noexec		[i386]
+			noexec=on: enable non-executable mappings (default)
+			noexec=off: disable nn-executable mappings
+
 	nofxsr		[BUGS=IA-32]
 
 	nohighio	[BUGS=IA-32] Disable highmem block I/O.
_
