diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 12:34:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 12:34:49 -0700 |
| commit | e06df6a7eae1ab1ef4deb076aeeaed90e948e5c0 (patch) | |
| tree | ff3a95036550939440f5cd2e7d251bb303b337f9 /Documentation | |
| parent | c0fc3cbac0a6fe40f98c5e5ed5f2df5e291bc94d (diff) | |
| parent | 9dd721c6dbfc310f94306902611f86dda87a45fa (diff) | |
| download | linux-e06df6a7eae1ab1ef4deb076aeeaed90e948e5c0.tar.bz2 | |
Merge branch 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 kaslr update from Ingo Molnar:
"This adds kernel module load address randomization"
* 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, kaslr: fix module lock ordering problem
x86, kaslr: randomize module base load address
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 06600cc9a26c..67755ea834a7 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -2060,8 +2060,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. IOAPICs that may be present in the system. nokaslr [X86] - Disable kernel base offset ASLR (Address Space - Layout Randomization) if built into the kernel. + Disable kernel and module base offset ASLR (Address + Space Layout Randomization) if built into the kernel. noautogroup Disable scheduler automatic task group creation. |