From: Seiji Aguchi Date: Wed, 30 Oct 2013 20:36:08 +0000 (-0400) Subject: x86, trace: Remove __alloc_intr_gate() X-Git-Tag: v3.13-rc1~92^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=959c071f0974cda7702d7574647de7ad9259eb57;p=thirdparty%2Fkernel%2Flinux.git x86, trace: Remove __alloc_intr_gate() Prepare to move set_intr_gate() into a macro by removing __alloc_intr_gate(). The purpose is to avoid failing a kernel build after applying a subsequent patch which changes set_intr_gate() into a macro. Signed-off-by: Seiji Aguchi Link: http://lkml.kernel.org/r/52716DB8.1080702@hds.com Signed-off-by: H. Peter Anvin --- diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h index b90e5dfeee462..d93956744cfd4 100644 --- a/arch/x86/include/asm/desc.h +++ b/arch/x86/include/asm/desc.h @@ -395,15 +395,10 @@ static inline void trace_set_intr_gate(unsigned int gate, void *addr) #define __trace_alloc_intr_gate(n, addr) #endif -static inline void __alloc_intr_gate(unsigned int n, void *addr) -{ - set_intr_gate(n, addr); -} - #define alloc_intr_gate(n, addr) \ do { \ alloc_system_vector(n); \ - __alloc_intr_gate(n, addr); \ + set_intr_gate(n, addr); \ __trace_alloc_intr_gate(n, trace_##addr); \ } while (0)