Skip to content

Commit 98d3e99

Browse files
H. Peter Anvinhansendc
authored andcommitted
x86/entry/vdso32: Remove SYSCALL_ENTER_KERNEL macro in sigreturn.S
A macro SYSCALL_ENTER_KERNEL was defined in sigreturn.S, with the ability of overriding it. The override capability, however, is not used anywhere, and the macro name is potentially confusing because it seems to imply that sysenter/syscall could be used here, which is NOT true: the sigreturn system calls MUST use int $0x80. Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Link: https://patch.msgid.link/20251216212606.1325678-6-hpa@zytor.com
1 parent 6e150b7 commit 98d3e99

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

arch/x86/entry/vdso/vdso32/sigreturn.S

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
#include <asm/unistd_32.h>
44
#include <asm/asm-offsets.h>
55

6-
#ifndef SYSCALL_ENTER_KERNEL
7-
#define SYSCALL_ENTER_KERNEL int $0x80
8-
#endif
9-
106
.text
117
.globl __kernel_sigreturn
128
.type __kernel_sigreturn,@function
@@ -16,7 +12,7 @@ __kernel_sigreturn:
1612
.LSTART_sigreturn:
1713
popl %eax /* XXX does this mean it needs unwind info? */
1814
movl $__NR_sigreturn, %eax
19-
SYSCALL_ENTER_KERNEL
15+
int $0x80
2016
.LEND_sigreturn:
2117
SYM_INNER_LABEL(vdso32_sigreturn_landing_pad, SYM_L_GLOBAL)
2218
nop
@@ -28,7 +24,7 @@ SYM_INNER_LABEL(vdso32_sigreturn_landing_pad, SYM_L_GLOBAL)
2824
__kernel_rt_sigreturn:
2925
.LSTART_rt_sigreturn:
3026
movl $__NR_rt_sigreturn, %eax
31-
SYSCALL_ENTER_KERNEL
27+
int $0x80
3228
.LEND_rt_sigreturn:
3329
SYM_INNER_LABEL(vdso32_rt_sigreturn_landing_pad, SYM_L_GLOBAL)
3430
nop

0 commit comments

Comments
 (0)