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

Commit 70ea6855 authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

x86-64: Slightly shorten int_ret_from_sys_call 



Testing for a return to ring 0 was necessary here solely because
of the branch out of ret_from_fork. That branch, however, can be
directed to retint_restore_args, and thus the test-and-branch
can be eliminated here.

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Reviewed-by: default avatarAndi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/4ED4C7EE0200007800064028@nat28.tlf.novell.com


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e9a9eca5

arch/x86/kernel/entry_64.S

+1 −3
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ ENTRY(ret_from_fork) 
	RESTORE_REST



	testl $3, CS-ARGOFFSET(%rsp)		# from kernel_thread?

	je   int_ret_from_sys_call

	jz   retint_restore_args



	testl $_TIF_IA32, TI_flags(%rcx)	# 32-bit compat task needs IRET

	jnz  int_ret_from_sys_call
@@ -612,8 +612,6 @@ tracesys: 
GLOBAL(int_ret_from_sys_call)

	DISABLE_INTERRUPTS(CLBR_NONE)

	TRACE_IRQS_OFF

	testl $3,CS-ARGOFFSET(%rsp)

	je retint_restore_args

	movl $_TIF_ALLWORK_MASK,%edi

	/* edi:	mask to check */

GLOBAL(int_with_check)