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

Commit 87fc5c68 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM fix from Russell King:
 "Just one fix this time around, for the late commit in the merge window
  that triggered a problem with qemu. Qemu is apparently also going to
  receive a fix for the discovered issue"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: avoid faulting on qemu
parents ae4806a3 3aaf33be

arch/arm/kernel/entry-header.S

+2 −2
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ 
	mov	r2, sp

	ldr	r1, [r2, #\offset + S_PSR]	@ get calling cpsr

	ldr	lr, [r2, #\offset + S_PC]!	@ get pc

	tst	r1, #0xcf

	tst	r1, #PSR_I_BIT | 0x0f

	bne	1f

	msr	spsr_cxsf, r1			@ save in spsr_svc

#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
@@ -332,7 +332,7 @@ 
	ldr	r1, [sp, #\offset + S_PSR]	@ get calling cpsr

	ldr	lr, [sp, #\offset + S_PC]	@ get pc

	add	sp, sp, #\offset + S_SP

	tst	r1, #0xcf

	tst	r1, #PSR_I_BIT | 0x0f

	bne	1f

	msr	spsr_cxsf, r1			@ save in spsr_svc