summaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-01-18 17:05:40 +0100
committerIngo Molnar <mingo@elte.hu>2010-01-20 08:58:04 +0100
commit016ddd9b5b315fe52ac6ba3167521f50b3868d34 (patch)
treed0e962ee53e0c7c7e1106048f3f1a717f068b112 /Documentation/kernel-parameters.txt
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff)
downloadlinux-016ddd9b5b315fe52ac6ba3167521f50b3868d34.tar.xz
linux-016ddd9b5b315fe52ac6ba3167521f50b3868d34.zip
x86: Put 'nopat' in kernel-parameters
Add missing 'nopat' boot option into Documentation/kernel-parameters.txt. Signed-off-by: Jiri Kosina <jkosina@suse.cz> LKML-Reference: <alpine.LNX.2.00.1001181703560.30977@pobox.suse.cz> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 736d45602886..5bf45c0ac749 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1729,6 +1729,9 @@ and is between 256 and 4096 characters. It is defined in the file
nomfgpt [X86-32] Disable Multi-Function General Purpose
Timer usage (for AMD Geode machines).
+ nopat [X86] Disable PAT (page attribute table extension of
+ pagetables) support.
+
norandmaps Don't use address space randomization. Equivalent to
echo 0 > /proc/sys/kernel/randomize_va_space