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

Commit d4d9959c authored by Rabin Vincent's avatar Rabin Vincent Committed by Russell King
Browse files

ARM: 6031/1: fix Thumb-2 decompressor 



98e12b5a ("ARM: Fix decompressor's kernel size estimation for
ROM=y") broke the Thumb-2 decompressor because it added an entry in the
LC0 table but didn't adjust the offset the Thumb-2 code uses to load the
SP from that table.  Fix it.

Cc: stable <stable@kernel.org>
Signed-off-by: default avatarRabin Vincent <rabin@rab.in>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4742723c

arch/arm/boot/compressed/head.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -172,7 +172,7 @@ not_angel: 
		adr	r0, LC0

		adr	r0, LC0

 ARM(		ldmia	r0, {r1, r2, r3, r4, r5, r6, r11, ip, sp})

 ARM(		ldmia	r0, {r1, r2, r3, r4, r5, r6, r11, ip, sp})

 THUMB(		ldmia	r0, {r1, r2, r3, r4, r5, r6, r11, ip}	)

 THUMB(		ldmia	r0, {r1, r2, r3, r4, r5, r6, r11, ip}	)

 THUMB(		ldr	sp, [r0, #28]				)

 THUMB(		ldr	sp, [r0, #32]				)

		subs	r0, r0, r1		@ calculate the delta offset

		subs	r0, r0, r1		@ calculate the delta offset





						@ if delta is zero, we are

						@ if delta is zero, we are