aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-08-31 04:22:06 -0400
committerThomas Gleixner <tglx@linutronix.de>2017-08-31 04:56:57 -0400
commit1d792a678c759b3b06af197c2c250cea13f9c57b (patch)
treec671a61c5f7eef219cfae78cbf0ffc7c2d52bc99
parentfacaa3e3c813848e6b49ee37a42a3688832e63cd (diff)
x86/idt: Remove the tracing IDT leftovers
Stephen reported a merge conflict with the XEN tree. That also shows that the IDT cleanup forgot to remove the now unused trace_{trap} defines. Remove them. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Juergen Gross <jgross@suse.com>
-rw-r--r--arch/x86/include/asm/traps.h18
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h
index b4f322d6c95f..cd0365ed0f68 100644
--- a/arch/x86/include/asm/traps.h
+++ b/arch/x86/include/asm/traps.h
@@ -38,24 +38,6 @@ asmlinkage void machine_check(void);
38#endif /* CONFIG_X86_MCE */ 38#endif /* CONFIG_X86_MCE */
39asmlinkage void simd_coprocessor_error(void); 39asmlinkage void simd_coprocessor_error(void);
40 40
41#ifdef CONFIG_TRACING
42#define trace_stack_segment stack_segment
43#define trace_divide_error divide_error
44#define trace_bounds bounds
45#define trace_invalid_op invalid_op
46#define trace_device_not_available device_not_available
47#define trace_coprocessor_segment_overrun coprocessor_segment_overrun
48#define trace_invalid_TSS invalid_TSS
49#define trace_segment_not_present segment_not_present
50#define trace_general_protection general_protection
51#define trace_spurious_interrupt_bug spurious_interrupt_bug
52#define trace_coprocessor_error coprocessor_error
53#define trace_alignment_check alignment_check
54#define trace_simd_coprocessor_error simd_coprocessor_error
55#define trace_async_page_fault async_page_fault
56#define trace_page_fault page_fault
57#endif
58
59dotraplinkage void do_divide_error(struct pt_regs *, long); 41dotraplinkage void do_divide_error(struct pt_regs *, long);
60dotraplinkage void do_debug(struct pt_regs *, long); 42dotraplinkage void do_debug(struct pt_regs *, long);
61dotraplinkage void do_nmi(struct pt_regs *, long); 43dotraplinkage void do_nmi(struct pt_regs *, long);