Commit 4229fb12 authored Jul 04, 2015 by Max Filippov

xtensa: fix threadptr reload on return to userspace



Userspace return code may skip restoring THREADPTR register if there are
no registers that need to be zeroed. This leads to spurious failures in
libc NPTL tests.

Always restore THREADPTR on return to userspace.

Cc: stable@vger.kernel.org
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>

parent 72ce6787

arch/xtensa/kernel/entry.S

+2 −1

Original line number	Diff line number	Diff line
		@@ -568,12 +568,13 @@ user_exception_exit:
		* (if we have restored WSBITS-1 frames).
		*/

		2:
		#if XCHAL_HAVE_THREADPTR
		l32i a3, a1, PT_THREADPTR
		wur a3, threadptr
		#endif

		2: j common_exception_exit
		j common_exception_exit

		/* This is the kernel exception exit.
		* We avoided to do a MOVSP when we entered the exception, but we

Admin message