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

Linus Torvalds committed 8 years ago

Commit 87fc5c62 parents ae4806a 3aaf33b1 file · +2 −2Browse files

Unified · Split

arch/arm/kernel/entry-header.S+2−2

@@ -300,7 +300,7 @@ · 299 unmodified lines
300	mov r2, sp	300	mov r2, sp
301	ldr r1, [r2, #\offset + S_PSR] @ get calling cpsr	301	ldr r1, [r2, #\offset + S_PSR] @ get calling cpsr
302	ldr lr, [r2, #\offset + S_PC]! @ get pc	302	ldr lr, [r2, #\offset + S_PC]! @ get pc
303	tst r1, #0xcf	303	tst r1, #PSR_I_BIT \| 0x0f
304	bne 1f	304	bne 1f
305	msr spsr_cxsf, r1 @ save in spsr_svc	305	msr spsr_cxsf, r1 @ save in spsr_svc
306	#if defined(CONFIG_CPU_V6) \|\| defined(CONFIG_CPU_32v6K)	306	#if defined(CONFIG_CPU_V6) \|\| defined(CONFIG_CPU_32v6K)
@@ -332,7 +332,7 @@ · 25 unmodified lines
332	ldr r1, [sp, #\offset + S_PSR] @ get calling cpsr	332	ldr r1, [sp, #\offset + S_PSR] @ get calling cpsr
333	ldr lr, [sp, #\offset + S_PC] @ get pc	333	ldr lr, [sp, #\offset + S_PC] @ get pc
334	add sp, sp, #\offset + S_SP	334	add sp, sp, #\offset + S_SP
335	tst r1, #0xcf	335	tst r1, #PSR_I_BIT \| 0x0f
336	bne 1f	336	bne 1f
337	msr spsr_cxsf, r1 @ save in spsr_svc	337	msr spsr_cxsf, r1 @ save in spsr_svc
338		338