Commit b927dfc6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:

 - fix nommu after getting rid of mini-stack for ARMv7

 - fix Thumb2 bug in iWMMXt exception handling

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9169/1: entry: fix Thumb2 bug in iWMMXt exception handling
  ARM: 9160/1: NOMMU: Reload __secondary_data after PROCINFO_INITFUNC
parents c8831184 8536a5ef

arch/arm/kernel/entry-armv.S

+3 −5
Original line number Diff line number Diff line
@@ -596,11 +596,9 @@ call_fpe: 
	tstne	r0, #0x04000000			@ bit 26 set on both ARM and Thumb-2

	reteq	lr

	and	r8, r0, #0x00000f00		@ mask out CP number

 THUMB(	lsr	r8, r8, #8		)

	mov	r7, #1

	add	r6, r10, #TI_USED_CP

 ARM(	strb	r7, [r6, r8, lsr #8]	)	@ set appropriate used_cp[]

 THUMB(	strb	r7, [r6, r8]		)	@ set appropriate used_cp[]

	add	r6, r10, r8, lsr #8		@ add used_cp[] array offset first

	strb	r7, [r6, #TI_USED_CP]		@ set appropriate used_cp[]

#ifdef CONFIG_IWMMXT

	@ Test if we need to give access to iWMMXt coprocessors

	ldr	r5, [r10, #TI_FLAGS]
@@ -609,7 +607,7 @@ call_fpe: 
	bcs	iwmmxt_task_enable

#endif

 ARM(	add	pc, pc, r8, lsr #6	)

 THUMB(	lsl	r8, r8, #2		)

 THUMB(	lsr	r8, r8, #6		)

 THUMB(	add	pc, r8			)

	nop

arch/arm/kernel/head-nommu.S

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ ENTRY(secondary_startup) 
	add	r12, r12, r10

	ret	r12

1:	bl	__after_proc_init

	ldr	r7, __secondary_data		@ reload r7

	ldr	sp, [r7, #12]			@ set up the stack pointer

	ldr	r0, [r7, #16]			@ set up task pointer

	mov	fp, #0