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

Commit 4aabd140 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Ingo Molnar
Browse files

x86/entry: Hide two syscall entry assertions behind CONFIG_DEBUG_ENTRY 



This shaves a few cycles off the slow paths.

Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/ce383fa9e129286ce6da6e00b53acd4c9fb5d06a.1444091585.git.luto@kernel.org


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

arch/x86/entry/common.c

+4 −2
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ unsigned long syscall_trace_enter_phase1(struct pt_regs *regs, u32 arch) 
	unsigned long ret = 0;

	u32 work;



	if (IS_ENABLED(CONFIG_DEBUG_ENTRY))

		BUG_ON(regs != task_pt_regs(current));



	work = ACCESS_ONCE(current_thread_info()->flags) &
@@ -160,6 +161,7 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch, 
	u32 work = ACCESS_ONCE(current_thread_info()->flags) &

		_TIF_WORK_SYSCALL_ENTRY;



	if (IS_ENABLED(CONFIG_DEBUG_ENTRY))

		BUG_ON(regs != task_pt_regs(current));



	/*