diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/cpu/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index cbc70a27430c..c8b41623377f 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
@@ -254,7 +254,7 @@ static inline void squash_the_stupid_serial_number(struct cpuinfo_x86 *c) | |||
254 | } | 254 | } |
255 | #endif | 255 | #endif |
256 | 256 | ||
257 | static int disable_smep __initdata; | 257 | static int disable_smep __cpuinitdata; |
258 | static __init int setup_disable_smep(char *arg) | 258 | static __init int setup_disable_smep(char *arg) |
259 | { | 259 | { |
260 | disable_smep = 1; | 260 | disable_smep = 1; |
@@ -262,7 +262,7 @@ static __init int setup_disable_smep(char *arg) | |||
262 | } | 262 | } |
263 | __setup("nosmep", setup_disable_smep); | 263 | __setup("nosmep", setup_disable_smep); |
264 | 264 | ||
265 | static __init void setup_smep(struct cpuinfo_x86 *c) | 265 | static __cpuinit void setup_smep(struct cpuinfo_x86 *c) |
266 | { | 266 | { |
267 | if (cpu_has(c, X86_FEATURE_SMEP)) { | 267 | if (cpu_has(c, X86_FEATURE_SMEP)) { |
268 | if (unlikely(disable_smep)) { | 268 | if (unlikely(disable_smep)) { |