From: Borislav Petkov <bp@suse.de>
Date: Thu, 7 May 2015 09:38:08 +0000 (+0200)
Subject: x86/traps: Remove superfluous weak definitions and dead code
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8cd161b1f755decd8b7f6c9c7144119281fe11a4;p=linux-beck.git

x86/traps: Remove superfluous weak definitions and dead code

Those were leftovers of the x86 merge, see

  081f75bbdc86 ("traps: x86: make traps_32.c and traps_64.c equal")

for example and are not needed now.

Signed-off-by: Borislav Petkov <bp@suse.de>
---

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 68b1d5979a46..2768bb663f94 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -813,23 +813,6 @@ dotraplinkage void
 do_spurious_interrupt_bug(struct pt_regs *regs, long error_code)
 {
 	conditional_sti(regs);
-#if 0
-	/* No need to warn about this any longer. */
-	pr_info("Ignoring P6 Local APIC Spurious Interrupt Bug...\n");
-#endif
-}
-
-asmlinkage __visible void __attribute__((weak)) smp_thermal_interrupt(void)
-{
-}
-
-asmlinkage __visible void __attribute__((weak)) smp_threshold_interrupt(void)
-{
-}
-
-asmlinkage __visible void __attribute__((weak))
-smp_deferred_error_interrupt(void)
-{
 }
 
 /*