diff options
author | 2011-05-19 18:10:17 -0700 | |
---|---|---|
committer | 2011-05-19 18:10:17 -0700 | |
commit | 5765040ebfc9a28d9dcfaaaaf3d25840d922de96 (patch) | |
tree | 6fd0c9950beb3c9730ede405269c9a47bbcbf877 /Documentation | |
parent | Merge branches 'x86-reboot-for-linus' and 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
parent | x86, cpu: Enable/disable Supervisor Mode Execution Protection (diff) | |
download | linux-dev-5765040ebfc9a28d9dcfaaaaf3d25840d922de96.tar.xz linux-dev-5765040ebfc9a28d9dcfaaaaf3d25840d922de96.zip |
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')
-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. noexec=on: enable non-executable mappings (default) noexec=off: disable non-executable mappings + nosmep [X86] + Disable SMEP (Supervisor Mode Execution Protection) + even if it is supported by processor. + noexec32 [X86-64] This affects only 32-bit executables. noexec32=on: enable non-executable mappings (default) |