Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d487624 authored by Fenghua Yu's avatar Fenghua Yu Committed by Ingo Molnar
Browse files

x86, SMEP: Fix section mismatch warnings 



Fix these kernel compilation warnings:

 WARNING: arch/x86/built-in.o(.cpuinit.text+0x1e07): Section mismatch ...
 WARNING: arch/x86/built-in.o(.cpuinit.text+0x1b10): Section mismatch ...

introduced by:

  de5397ad: x86, cpu: Enable/disable Supervisor Mode Execution Protection

Change disable_smep from __initdata to __cpuinitdata.
Change setup_smep() from __init to __cpuinit.

Reported-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
Cc: Asit K Mallick <asit.k.mallick@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/1305930797-11409-1-git-send-email-fenghua.yu@intel.com


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d47cc0db

arch/x86/kernel/cpu/common.c

+2 −2
Original line number Diff line number Diff line
@@ -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)) {