From 11623ec8d521916d1d3e0ec5d4aca933ad9da2bf Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 May 2011 21:37:01 -0700
Subject: [PATCH] --- yaml --- r: 247867 b: refs/heads/master c:
 82da65dab5f438ac7df28eeb43e2f5b742aa00ef h: refs/heads/master i:   247865:
 23d09f9351291bde85c582e66b7027461ee49776   247863:
 5467d9c8917068b5fe1c45949364fa7ac7fb8c48 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/cpu/common.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c0789be0c8d5..db863b849f0d 100644
--- 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
index cbc70a27430c..c8b41623377f 100644
--- a/trunk/arch/x86/kernel/cpu/common.c
+++ b/trunk/arch/x86/kernel/cpu/common.c
@@ -254,7 +254,7 @@ 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;
@@ -262,7 +262,7 @@ static __init int setup_disable_smep(char *arg)
 }
 __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)) {