---

yaml --- r: 247867 b: refs/heads/master c: 82da65d h: refs/heads/master i: 247865: 23d09f9 247863: 5467d9c v: v3
git-mirror · May 23, 2011 · 11623ec · 11623ec
1 parent 1a73e16
commit 11623ec
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: a1e4891fd48d298870b704c6eb48cba0da5ed6b1
+refs/heads/master: 82da65dab5f438ac7df28eeb43e2f5b742aa00ef
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)) {