diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 15:34:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 15:34:49 -0400 |
| commit | e06df6a7eae1ab1ef4deb076aeeaed90e948e5c0 (patch) | |
| tree | ff3a95036550939440f5cd2e7d251bb303b337f9 /Documentation/kernel-parameters.txt | |
| parent | c0fc3cbac0a6fe40f98c5e5ed5f2df5e291bc94d (diff) | |
| parent | 9dd721c6dbfc310f94306902611f86dda87a45fa (diff) | |
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/kernel-parameters.txt')
| -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. | |||
| 2060 | IOAPICs that may be present in the system. | 2060 | IOAPICs that may be present in the system. |
| 2061 | 2061 | ||
| 2062 | nokaslr [X86] | 2062 | nokaslr [X86] |
| 2063 | Disable kernel base offset ASLR (Address Space | 2063 | Disable kernel and module base offset ASLR (Address |
| 2064 | Layout Randomization) if built into the kernel. | 2064 | Space Layout Randomization) if built into the kernel. |
| 2065 | 2065 | ||
| 2066 | noautogroup Disable scheduler automatic task group creation. | 2066 | noautogroup Disable scheduler automatic task group creation. |
| 2067 | 2067 | ||