x86, smap: Turn on Supervisor Mode Access Prevention

If Supervisor Mode Access Prevention is available and not disabled by
the user, turn it on.  Also fix the expansion of SMEP (Supervisor Mode
Execution Prevention.)

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Link: http://lkml.kernel.org/r/1348256595-29119-10-git-send-email-hpa@linux.intel.com

1 files changed, 5 insertions, 1 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ad7e2e5088c1..49c5c41b07e1 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1812,8 +1812,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         noexec=on: enable non-executable mappings (default)
                         noexec=off: disable non-executable mappings
 
+        nosmap          [X86]
+                        Disable SMAP (Supervisor Mode Access Prevention)
+                        even if it is supported by processor.
+
         nosmep          [X86]
-                        Disable SMEP (Supervisor Mode Execution Protection)
+                        Disable SMEP (Supervisor Mode Execution Prevention)
                         even if it is supported by processor.
 
         noexec32        [X86-64]