Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac7f5dfb authored by Denys Vlasenko's avatar Denys Vlasenko Committed by Ingo Molnar
Browse files

x86/asm/entry/64: Merge 32-bit execve stubs with x32 ones, as they are identical 



Run-tested.

Suggested-by: default avatarBrian Gerst <brgerst@gmail.com>
Signed-off-by: default avatarDenys Vlasenko <dvlasenk@redhat.com>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Andy Lutomirski <luto@amacapital.net>
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: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Drewry <wad@chromium.org>
Link: http://lkml.kernel.org/r/1429632194-13445-1-git-send-email-dvlasenk@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 17be0aec

arch/x86/kernel/entry_64.S

+5 −18
Original line number Diff line number Diff line
@@ -525,40 +525,27 @@ GLOBAL(stub_execveat) 
	CFI_ENDPROC

END(stub_execveat)



#ifdef CONFIG_X86_X32_ABI

#if defined(CONFIG_X86_X32_ABI) || defined(CONFIG_IA32_EMULATION)

	.align	8

GLOBAL(stub_x32_execve)

GLOBAL(stub32_execve)

	CFI_STARTPROC

	DEFAULT_FRAME 0, 8

	call	compat_sys_execve

	jmp	return_from_execve

	CFI_ENDPROC

END(stub32_execve)

END(stub_x32_execve)

	.align	8

GLOBAL(stub_x32_execveat)

	CFI_STARTPROC

	DEFAULT_FRAME 0, 8

	call	compat_sys_execveat

	jmp	return_from_execve

	CFI_ENDPROC

END(stub_x32_execveat)

#endif



#ifdef CONFIG_IA32_EMULATION

	.align	8

GLOBAL(stub32_execve)

	CFI_STARTPROC

	call	compat_sys_execve

	jmp	return_from_execve

	CFI_ENDPROC

END(stub32_execve)

	.align	8

GLOBAL(stub32_execveat)

	CFI_STARTPROC

	DEFAULT_FRAME 0, 8

	call	compat_sys_execveat

	jmp	return_from_execve

	CFI_ENDPROC

END(stub32_execveat)

END(stub_x32_execveat)

#endif



/*