Commit 3fb28e19 authored Oct 09, 2021 by Sven Schnelle Committed by Helge Deller Oct 30, 2021

parisc: fix preempt_count() check in entry.S



preempt_count in struct thread_info is unsigned int,
but the entry.S code used LDREG, which generates a 64 bit
load when compiled for 64 bit. Fix this to use an ldw and
also change the condition in the compare one line below
to only compares 32 bits, although ldw zero extends, and
that should work with a 64 bit compare.

Signed-off-by: Sven Schnelle <svens@stackframe.org>
Signed-off-by: Helge Deller <deller@gmx.de>

parent 4f193867

arch/parisc/kernel/entry.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -974,8 +974,8 @@ intr_do_preempt:

		/* current_thread_info()->preempt_count */
		mfctl %cr30, %r1
		LDREG TI_PRE_COUNT(%r1), %r19
		cmpib,COND(<>) 0, %r19, intr_restore /* if preempt_count > 0 */
		ldw TI_PRE_COUNT(%r1), %r19
		cmpib,<> 0, %r19, intr_restore /* if preempt_count > 0 */
		nop /* prev insn branched backwards */

		/* check if we interrupted a critical path */