aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-10-10 20:18:14 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2013-10-13 06:12:07 -0400
commit8ab3820fd5b2896d66da7bb2a906bc382e63e7bc (patch)
tree50f6f4458f86eb66552c13bef81169e44d27dc28 /Documentation/kernel-parameters.txt
parentdd78b97367bd575918204cc89107c1479d3fc1a7 (diff)
x86, kaslr: Return location from decompress_kernel
This allows decompress_kernel to return a new location for the kernel to be relocated to. Additionally, enforces CONFIG_PHYSICAL_START as the minimum relocation position when building with CONFIG_RELOCATABLE. With CONFIG_RANDOMIZE_BASE set, the choose_kernel_location routine will select a new location to decompress the kernel, though here it is presently a no-op. The kernel command line option "nokaslr" is introduced to bypass these routines. Signed-off-by: Kees Cook <keescook@chromium.org> Link: http://lkml.kernel.org/r/1381450698-28710-3-git-send-email-keescook@chromium.org Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index fcbb736d55fe..773fc4c077b4 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1975,6 +1975,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
1975 noapic [SMP,APIC] Tells the kernel to not make use of any 1975 noapic [SMP,APIC] Tells the kernel to not make use of any
1976 IOAPICs that may be present in the system. 1976 IOAPICs that may be present in the system.
1977 1977
1978 nokaslr [X86]
1979 Disable kernel base offset ASLR (Address Space
1980 Layout Randomization) if built into the kernel.
1981
1978 noautogroup Disable scheduler automatic task group creation. 1982 noautogroup Disable scheduler automatic task group creation.
1979 1983
1980 nobats [PPC] Do not use BATs for mapping kernel lowmem 1984 nobats [PPC] Do not use BATs for mapping kernel lowmem