Commit 320100a5 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/entry: Remove the TRACE_IRQS cruft 



No more users.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarAndy Lutomirski <luto@kernel.org>
Link: https://lore.kernel.org/r/20200521202120.523289762@linutronix.de
parent 3ffdfdce

arch/x86/entry/entry_64.S

+0 −13
Original line number Diff line number Diff line
@@ -53,19 +53,6 @@ SYM_CODE_START(native_usergs_sysret64) 
SYM_CODE_END(native_usergs_sysret64)

#endif /* CONFIG_PARAVIRT */



.macro TRACE_IRQS_FLAGS flags:req

#ifdef CONFIG_TRACE_IRQFLAGS

	btl	$9, \flags		/* interrupts off? */

	jnc	1f

	TRACE_IRQS_ON

1:

#endif

.endm



.macro TRACE_IRQS_IRETQ

	TRACE_IRQS_FLAGS EFLAGS(%rsp)

.endm



/*

 * 64-bit SYSCALL instruction entry. Up to 6 arguments in registers.

 *

arch/x86/entry/thunk_64.S

+1 −8
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
 * Save registers before calling assembly functions. This avoids

 * disturbance of register allocation in some inline assembly constructs.

 * Copyright 2001,2002 by Andi Kleen, SuSE Labs.

 * Added trace_hardirqs callers - Copyright 2007 Steven Rostedt, Red Hat, Inc.

 */

#include <linux/linkage.h>

#include "calling.h"
@@ -37,11 +36,6 @@ SYM_FUNC_END(\name) 
	_ASM_NOKPROBE(\name)

	.endm



#ifdef CONFIG_TRACE_IRQFLAGS

	THUNK trace_hardirqs_on_thunk,trace_hardirqs_on_caller,1

	THUNK trace_hardirqs_off_thunk,trace_hardirqs_off_caller,1

#endif



#ifdef CONFIG_PREEMPTION

	THUNK preempt_schedule_thunk, preempt_schedule

	THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace
@@ -49,8 +43,7 @@ SYM_FUNC_END(\name) 
	EXPORT_SYMBOL(preempt_schedule_notrace_thunk)

#endif



#if defined(CONFIG_TRACE_IRQFLAGS) \

 || defined(CONFIG_PREEMPTION)

#ifdef CONFIG_PREEMPTION

SYM_CODE_START_LOCAL_NOALIGN(.L_restore)

	popq %r11

	popq %r10

arch/x86/include/asm/irqflags.h

+0 −10
Original line number Diff line number Diff line
@@ -172,14 +172,4 @@ static inline int arch_irqs_disabled(void) 
}

#endif /* !__ASSEMBLY__ */



#ifdef __ASSEMBLY__

#ifdef CONFIG_TRACE_IRQFLAGS

#  define TRACE_IRQS_ON		call trace_hardirqs_on_thunk;

#  define TRACE_IRQS_OFF	call trace_hardirqs_off_thunk;

#else

#  define TRACE_IRQS_ON

#  define TRACE_IRQS_OFF

#endif

#endif /* __ASSEMBLY__ */



#endif