diff options
author | Seiji Aguchi <seiji.aguchi@hds.com> | 2013-10-30 16:37:47 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-11-08 17:15:47 -0500 |
commit | ac7956e2699380b8b10146ec2ba8cbe43a03ff7a (patch) | |
tree | ad2ef9e7c302612a274fab8c4b8bc1f29ace1d88 | |
parent | 25c74b10bacead867478480170083f69cfc0db48 (diff) |
x86, trace: Delete __trace_alloc_intr_gate()
Currently irq vector handlers for tracing are registered in both set_intr_gate()
and __trace_alloc_intr_gate() in alloc_intr_gate().
But, we don't need to do that twice.
So, let's delete __trace_alloc_intr_gate().
Signed-off-by: Seiji Aguchi <seiji.aguchi@hds.com>
Link: http://lkml.kernel.org/r/52716E1B.7090205@hds.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r-- | arch/x86/include/asm/desc.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h index 3d73437600d7..50d033a8947d 100644 --- a/arch/x86/include/asm/desc.h +++ b/arch/x86/include/asm/desc.h | |||
@@ -392,32 +392,10 @@ static inline void alloc_system_vector(int vector) | |||
392 | } | 392 | } |
393 | } | 393 | } |
394 | 394 | ||
395 | #ifdef CONFIG_TRACING | ||
396 | static inline void trace_set_intr_gate(unsigned int gate, void *addr) | ||
397 | { | ||
398 | gate_desc s; | ||
399 | |||
400 | pack_gate(&s, GATE_INTERRUPT, (unsigned long)addr, 0, 0, __KERNEL_CS); | ||
401 | write_idt_entry(trace_idt_table, gate, &s); | ||
402 | } | ||
403 | |||
404 | static inline void __trace_alloc_intr_gate(unsigned int n, void *addr) | ||
405 | { | ||
406 | trace_set_intr_gate(n, addr); | ||
407 | } | ||
408 | #else | ||
409 | static inline void trace_set_intr_gate(unsigned int gate, void *addr) | ||
410 | { | ||
411 | } | ||
412 | |||
413 | #define __trace_alloc_intr_gate(n, addr) | ||
414 | #endif | ||
415 | |||
416 | #define alloc_intr_gate(n, addr) \ | 395 | #define alloc_intr_gate(n, addr) \ |
417 | do { \ | 396 | do { \ |
418 | alloc_system_vector(n); \ | 397 | alloc_system_vector(n); \ |
419 | set_intr_gate(n, addr); \ | 398 | set_intr_gate(n, addr); \ |
420 | __trace_alloc_intr_gate(n, trace_##addr); \ | ||
421 | } while (0) | 399 | } while (0) |
422 | 400 | ||
423 | /* | 401 | /* |