diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 21:10:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 21:10:17 -0400 |
| commit | 5765040ebfc9a28d9dcfaaaaf3d25840d922de96 (patch) | |
| tree | 6fd0c9950beb3c9730ede405269c9a47bbcbf877 /Documentation/kernel-parameters.txt | |
| parent | 08839ff8276bd1ba0ce8b2d595f9fe62a5b07210 (diff) | |
| parent | de5397ad5b9ad22e2401c4dacdf1bb3b19c05679 (diff) | |
Merge branch 'x86-smep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-smep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, cpu: Enable/disable Supervisor Mode Execution Protection
x86, cpu: Add SMEP CPU feature in CR4
x86, cpufeature: Add cpufeature flag for SMEP
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 259037b873b7..c603ef7b0568 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -1664,6 +1664,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
| 1664 | noexec=on: enable non-executable mappings (default) | 1664 | noexec=on: enable non-executable mappings (default) |
| 1665 | noexec=off: disable non-executable mappings | 1665 | noexec=off: disable non-executable mappings |
| 1666 | 1666 | ||
| 1667 | nosmep [X86] | ||
| 1668 | Disable SMEP (Supervisor Mode Execution Protection) | ||
| 1669 | even if it is supported by processor. | ||
| 1670 | |||
| 1667 | noexec32 [X86-64] | 1671 | noexec32 [X86-64] |
| 1668 | This affects only 32-bit executables. | 1672 | This affects only 32-bit executables. |
| 1669 | noexec32=on: enable non-executable mappings (default) | 1673 | noexec32=on: enable non-executable mappings (default) |