diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-02-25 09:00:38 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-02-25 09:00:38 +0100 |
commit | c0853867a10f9215132dccdb84c720a5f856f4d2 (patch) | |
tree | 92d3162ea2fc6fe0276dabc869e01293325f862c /arch/x86/kernel/cpu/common.c | |
parent | Merge tag 'arc-4.5-rc6-fixes-upd' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | watchdog/hpwdt: Fix build on certain configs (diff) | |
download | linux-c0853867a10f9215132dccdb84c720a5f856f4d2.tar.xz linux-c0853867a10f9215132dccdb84c720a5f856f4d2.zip |
Merge branch 'x86/debug' into core/objtool, to pick up frame pointer fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/common.c')
-rw-r--r-- | arch/x86/kernel/cpu/common.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 37830de8f60a..079d83fc6488 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1475,20 +1475,6 @@ void cpu_init(void) } #endif -#ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS -void warn_pre_alternatives(void) -{ - WARN(1, "You're using static_cpu_has before alternatives have run!\n"); -} -EXPORT_SYMBOL_GPL(warn_pre_alternatives); -#endif - -inline bool __static_cpu_has_safe(u16 bit) -{ - return boot_cpu_has(bit); -} -EXPORT_SYMBOL_GPL(__static_cpu_has_safe); - static void bsp_resume(void) { if (this_cpu->c_bsp_resume) |