Skip to content

Commit

Permalink
x86: Remove unused bits from lib/thunk_*.S
Browse files Browse the repository at this point in the history
Some of the items removed were apparently never used, others
simply didn't get removed with their last user.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
LKML-Reference: <4D6BD3A002000078000341F1@vpn.id2.novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Jan Beulich authored and Ingo Molnar committed Feb 28, 2011
1 parent 60cf637 commit 039e138
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 45 deletions.
18 changes: 0 additions & 18 deletions arch/x86/lib/thunk_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,6 @@

#include <linux/linkage.h>

#define ARCH_TRACE_IRQS_ON \
pushl %eax; \
pushl %ecx; \
pushl %edx; \
call trace_hardirqs_on; \
popl %edx; \
popl %ecx; \
popl %eax;

#define ARCH_TRACE_IRQS_OFF \
pushl %eax; \
pushl %ecx; \
pushl %edx; \
call trace_hardirqs_off; \
popl %edx; \
popl %ecx; \
popl %eax;

#ifdef CONFIG_TRACE_IRQFLAGS
/* put return address in eax (arg1) */
.macro thunk_ra name,func
Expand Down
27 changes: 0 additions & 27 deletions arch/x86/lib/thunk_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,6 @@
CFI_ENDPROC
.endm

/* rdi: arg1 ... normal C conventions. rax is passed from C. */
.macro thunk_retrax name,func
.globl \name
\name:
CFI_STARTPROC
SAVE_ARGS
call \func
jmp restore_norax
CFI_ENDPROC
.endm


.section .sched.text, "ax"
#ifdef CONFIG_RWSEM_XCHGADD_ALGORITHM
thunk rwsem_down_read_failed_thunk,rwsem_down_read_failed
thunk rwsem_down_write_failed_thunk,rwsem_down_write_failed
thunk rwsem_wake_thunk,rwsem_wake
thunk rwsem_downgrade_thunk,rwsem_downgrade_wake
#endif

#ifdef CONFIG_TRACE_IRQFLAGS
/* put return address in rdi (arg1) */
.macro thunk_ra name,func
Expand Down Expand Up @@ -72,10 +52,3 @@ restore:
RESTORE_ARGS
ret
CFI_ENDPROC

CFI_STARTPROC
SAVE_ARGS
restore_norax:
RESTORE_ARGS 1
ret
CFI_ENDPROC

0 comments on commit 039e138

Please sign in to comment.