[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-1d487624fcc17a40aa67acaa9e8f3815fb7cd0f0@git.kernel.org>
Date: Sat, 21 May 2011 17:19:52 GMT
From: tip-bot for Fenghua Yu <fenghua.yu@...el.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
yinghai@...nel.org, torvalds@...ux-foundation.org,
asit.k.mallick@...el.com, fenghua.yu@...el.com, tglx@...utronix.de,
mingo@...e.hu
Subject: [tip:x86/urgent] x86, SMEP: Fix section mismatch warnings
Commit-ID: 1d487624fcc17a40aa67acaa9e8f3815fb7cd0f0
Gitweb: http://git.kernel.org/tip/1d487624fcc17a40aa67acaa9e8f3815fb7cd0f0
Author: Fenghua Yu <fenghua.yu@...el.com>
AuthorDate: Fri, 20 May 2011 15:33:17 -0700
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Sat, 21 May 2011 12:46:24 +0200
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:
de5397ad5b9a: x86, cpu: Enable/disable Supervisor Mode Execution Protection
Change disable_smep from __initdata to __cpuinitdata.
Change setup_smep() from __init to __cpuinit.
Reported-by: Yinghai Lu <yinghai@...nel.org>
Signed-off-by: Fenghua Yu <fenghua.yu@...el.com>
Cc: Asit K Mallick <asit.k.mallick@...el.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Link: http://lkml.kernel.org/r/1305930797-11409-1-git-send-email-fenghua.yu@intel.com
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
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 cbc70a2..c8b4162 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)
}
#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)) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists