Commit 6241e5cc authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC64]: Fix branch signedness bug in all code patching. 



The bug that hit SUN4V TLB patching exists elsewhere.
Make sure we cure all such cases.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1a7a242c

arch/sparc64/lib/NGpage.S

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ NGclear_user_page: /* %o0=dest, %o1=vaddr */ 
	or	%g2, %lo(OLD), %g2; \

	sub	%g1, %g2, %g1; \

	sethi	%hi(BRANCH_ALWAYS), %g3; \

	srl	%g1, 2, %g1; \

	sll	%g1, 11, %g1; \

	srl	%g1, 11 + 2, %g1; \

	or	%g3, %lo(BRANCH_ALWAYS), %g3; \

	or	%g3, %g1, %g3; \

	stw	%g3, [%g2]; \

arch/sparc64/lib/NGpatch.S

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ 
	or	%g2, %lo(OLD), %g2; \

	sub	%g1, %g2, %g1; \

	sethi	%hi(BRANCH_ALWAYS), %g3; \

	srl	%g1, 2, %g1; \

	sll	%g1, 11, %g1; \

	srl	%g1, 11 + 2, %g1; \

	or	%g3, %lo(BRANCH_ALWAYS), %g3; \

	or	%g3, %g1, %g3; \

	stw	%g3, [%g2]; \

arch/sparc64/lib/U3patch.S

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ 
	or	%g2, %lo(OLD), %g2; \

	sub	%g1, %g2, %g1; \

	sethi	%hi(BRANCH_ALWAYS), %g3; \

	srl	%g1, 2, %g1; \

	sll	%g1, 11, %g1; \

	srl	%g1, 11 + 2, %g1; \

	or	%g3, %lo(BRANCH_ALWAYS), %g3; \

	or	%g3, %g1, %g3; \

	stw	%g3, [%g2]; \

CRA Git | Maintained and supported by SUSTech CRA and CCSE