From a4b328fc90166c8fc5523b7266db4b92f62e8f8b Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 5 Sep 2008 10:23:26 +0200
Subject: [PATCH] --- yaml --- r: 112829 b: refs/heads/master c:
 deed05b7c017e49473e8c386efba196410fd18b3 h: refs/heads/master i:   112827:
 2a6d0badc15ee5c1089b0aa9994287a891657e51 v: v3

---
 [refs]                      |  2 +-
 trunk/arch/x86/mm/init_64.c | 28 +++++++++++++++-------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 5fefcf25f29b..cb82147a2f93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd220a24a9263eaa70d5e6821383085950b5a13c
+refs/heads/master: deed05b7c017e49473e8c386efba196410fd18b3
diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
index 9c750d6307b0..1f6806b62eb8 100644
--- a/trunk/arch/x86/mm/init_64.c
+++ b/trunk/arch/x86/mm/init_64.c
@@ -93,12 +93,13 @@ EXPORT_SYMBOL_GPL(__supported_pte_mask);
 
 static int do_not_nx __cpuinitdata;
 
-/* noexec=on|off
-Control non executable mappings for 64bit processes.
-
-on	Enable(default)
-off	Disable
-*/
+/*
+ * noexec=on|off
+ * Control non-executable mappings for 64-bit processes.
+ *
+ * on	Enable (default)
+ * off	Disable
+ */
 static int __init nonx_setup(char *str)
 {
 	if (!str)
@@ -125,13 +126,14 @@ void __cpuinit check_efer(void)
 
 int force_personality32;
 
-/* noexec32=on|off
-Control non executable heap for 32bit processes.
-To control the stack too use noexec=off
-
-on	PROT_READ does not imply PROT_EXEC for 32bit processes (default)
-off	PROT_READ implies PROT_EXEC
-*/
+/*
+ * noexec32=on|off
+ * Control non executable heap for 32bit processes.
+ * To control the stack too use noexec=off
+ *
+ * on	PROT_READ does not imply PROT_EXEC for 32-bit processes (default)
+ * off	PROT_READ implies PROT_EXEC
+ */
 static int __init nonx32_setup(char *str)
 {
 	if (!strcmp(str, "on"))