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

Commit 62d08aec authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'context_tracking/fixes' of... 

Merge branch 'context_tracking/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks

 into sched/urgent

Pull context tracking ARM fix from Frederic Weisbecker.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 82dfaa58 0c06a5d4

arch/arm/kernel/entry-header.S

+4 −4
Original line number Diff line number Diff line
@@ -329,10 +329,10 @@ 
#ifdef CONFIG_CONTEXT_TRACKING

	.if	\save

	stmdb   sp!, {r0-r3, ip, lr}

	bl	user_exit

	bl	context_tracking_user_exit

	ldmia	sp!, {r0-r3, ip, lr}

	.else

	bl	user_exit

	bl	context_tracking_user_exit

	.endif

#endif

	.endm
@@ -341,10 +341,10 @@ 
#ifdef CONFIG_CONTEXT_TRACKING

	.if	\save

	stmdb   sp!, {r0-r3, ip, lr}

	bl	user_enter

	bl	context_tracking_user_enter

	ldmia	sp!, {r0-r3, ip, lr}

	.else

	bl	user_enter

	bl	context_tracking_user_enter

	.endif

#endif

	.endm

kernel/context_tracking.c

+12 −0
Original line number Diff line number Diff line
@@ -50,6 +50,15 @@ void context_tracking_user_enter(void) 
{

	unsigned long flags;



	/*

	 * Repeat the user_enter() check here because some archs may be calling

	 * this from asm and if no CPU needs context tracking, they shouldn't

	 * go further. Repeat the check here until they support the static key

	 * check.

	 */

	if (!static_key_false(&context_tracking_enabled))

		return;



	/*

	 * Some contexts may involve an exception occuring in an irq,

	 * leading to that nesting:
@@ -151,6 +160,9 @@ void context_tracking_user_exit(void) 
{

	unsigned long flags;



	if (!static_key_false(&context_tracking_enabled))

		return;



	if (in_interrupt())

		return;