Skip to content

Commit 320100a

Browse files
committed
x86/entry: Remove the TRACE_IRQS cruft
No more users. Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Acked-by: Andy Lutomirski <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 3ffdfdc commit 320100a

File tree

3 files changed

+1
-31
lines changed

3 files changed

+1
-31
lines changed

arch/x86/entry/entry_64.S

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,6 @@ SYM_CODE_START(native_usergs_sysret64)
5353
SYM_CODE_END(native_usergs_sysret64)
5454
#endif /* CONFIG_PARAVIRT */
5555

56-
.macro TRACE_IRQS_FLAGS flags:req
57-
#ifdef CONFIG_TRACE_IRQFLAGS
58-
btl $9, \flags /* interrupts off? */
59-
jnc 1f
60-
TRACE_IRQS_ON
61-
1:
62-
#endif
63-
.endm
64-
65-
.macro TRACE_IRQS_IRETQ
66-
TRACE_IRQS_FLAGS EFLAGS(%rsp)
67-
.endm
68-
6956
/*
7057
* 64-bit SYSCALL instruction entry. Up to 6 arguments in registers.
7158
*

arch/x86/entry/thunk_64.S

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Save registers before calling assembly functions. This avoids
44
* disturbance of register allocation in some inline assembly constructs.
55
* Copyright 2001,2002 by Andi Kleen, SuSE Labs.
6-
* Added trace_hardirqs callers - Copyright 2007 Steven Rostedt, Red Hat, Inc.
76
*/
87
#include <linux/linkage.h>
98
#include "calling.h"
@@ -37,20 +36,14 @@ SYM_FUNC_END(\name)
3736
_ASM_NOKPROBE(\name)
3837
.endm
3938

40-
#ifdef CONFIG_TRACE_IRQFLAGS
41-
THUNK trace_hardirqs_on_thunk,trace_hardirqs_on_caller,1
42-
THUNK trace_hardirqs_off_thunk,trace_hardirqs_off_caller,1
43-
#endif
44-
4539
#ifdef CONFIG_PREEMPTION
4640
THUNK preempt_schedule_thunk, preempt_schedule
4741
THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace
4842
EXPORT_SYMBOL(preempt_schedule_thunk)
4943
EXPORT_SYMBOL(preempt_schedule_notrace_thunk)
5044
#endif
5145

52-
#if defined(CONFIG_TRACE_IRQFLAGS) \
53-
|| defined(CONFIG_PREEMPTION)
46+
#ifdef CONFIG_PREEMPTION
5447
SYM_CODE_START_LOCAL_NOALIGN(.L_restore)
5548
popq %r11
5649
popq %r10

arch/x86/include/asm/irqflags.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,4 @@ static inline int arch_irqs_disabled(void)
172172
}
173173
#endif /* !__ASSEMBLY__ */
174174

175-
#ifdef __ASSEMBLY__
176-
#ifdef CONFIG_TRACE_IRQFLAGS
177-
# define TRACE_IRQS_ON call trace_hardirqs_on_thunk;
178-
# define TRACE_IRQS_OFF call trace_hardirqs_off_thunk;
179-
#else
180-
# define TRACE_IRQS_ON
181-
# define TRACE_IRQS_OFF
182-
#endif
183-
#endif /* __ASSEMBLY__ */
184-
185175
#endif

0 commit comments

Comments
 (0)