Skip to content

Commit

Permalink
x86/asm/entry/64: Remove stub_iopl
Browse files Browse the repository at this point in the history
stub_iopl is no longer needed: pt_regs->flags needs no fixing up
after previous change. Remove it.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Will Drewry <wad@chromium.org>
Link: http://lkml.kernel.org/r/1425984307-2143-1-git-send-email-dvlasenk@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Denys Vlasenko authored and Ingo Molnar committed Mar 10, 2015
1 parent 29722cd commit 616ab24
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 15 deletions.
13 changes: 0 additions & 13 deletions arch/x86/kernel/entry_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -421,22 +421,9 @@ ENTRY(stub_\func)
END(stub_\func)
.endm

.macro FIXED_FRAME label,func
ENTRY(\label)
CFI_STARTPROC
DEFAULT_FRAME 0, 8 /* offset 8: return address */
FIXUP_TOP_OF_STACK %r11, 8
call \func
RESTORE_TOP_OF_STACK %r11, 8
ret
CFI_ENDPROC
END(\label)
.endm

FORK_LIKE clone
FORK_LIKE fork
FORK_LIKE vfork
FIXED_FRAME stub_iopl, sys_iopl

ENTRY(stub_execve)
CFI_STARTPROC
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/syscalls/syscall_64.tbl
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
169 common reboot sys_reboot
170 common sethostname sys_sethostname
171 common setdomainname sys_setdomainname
172 common iopl stub_iopl
172 common iopl sys_iopl
173 common ioperm sys_ioperm
174 64 create_module
175 common init_module sys_init_module
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/um/sys_call_table_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

/* Not going to be implemented by UML, since we have no hardware. */
#define stub_iopl sys_ni_syscall
#define sys_iopl sys_ni_syscall
#define sys_ioperm sys_ni_syscall

/*
Expand Down

0 comments on commit 616ab24

Please sign in to comment.