---

yaml --- r: 248115 b: refs/heads/master c: 1d48762 h: refs/heads/master i: 248113: 2d81d7b 248111: 2301f61 v: v3
git-mirror · May 21, 2011 · 908cffc · 908cffc
1 parent 0b03e67
commit 908cffc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d47cc0db8fd6011de2248df505fc34990b7451bf
+refs/heads/master: 1d487624fcc17a40aa67acaa9e8f3815fb7cd0f0
diff --git a/trunk/arch/x86/kernel/cpu/common.c b/trunk/arch/x86/kernel/cpu/common.c
@@ -254,15 +254,15 @@ static inline void squash_the_stupid_serial_number(struct cpuinfo_x86 *c)
 }
 #endif
 
-static int disable_smep __initdata;
+static int disable_smep __cpuinitdata;
 static __init int setup_disable_smep(char *arg)
 {
 	disable_smep = 1;
 	return 1;
 }
 __setup("nosmep", setup_disable_smep);
 
-static __init void setup_smep(struct cpuinfo_x86 *c)
+static __cpuinit void setup_smep(struct cpuinfo_x86 *c)
 {
 	if (cpu_has(c, X86_FEATURE_SMEP)) {
 		if (unlikely(disable_smep)) {