Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
-5
+3
-5
arch/arm/kernel/entry-armv.S
+3
-5
arch/arm/kernel/entry-armv.S
···
596
596
tstne r0, #0x04000000 @ bit 26 set on both ARM and Thumb-2
597
597
reteq lr
598
598
and r8, r0, #0x00000f00 @ mask out CP number
599
-
THUMB( lsr r8, r8, #8 )
600
599
mov r7, #1
601
-
add r6, r10, #TI_USED_CP
602
-
ARM( strb r7, [r6, r8, lsr #8] ) @ set appropriate used_cp[]
603
-
THUMB( strb r7, [r6, r8] ) @ set appropriate used_cp[]
600
+
add r6, r10, r8, lsr #8 @ add used_cp[] array offset first
601
+
strb r7, [r6, #TI_USED_CP] @ set appropriate used_cp[]
604
602
#ifdef CONFIG_IWMMXT
605
603
@ Test if we need to give access to iWMMXt coprocessors
606
604
ldr r5, [r10, #TI_FLAGS]
···
607
609
bcs iwmmxt_task_enable
608
610
#endif
609
611
ARM( add pc, pc, r8, lsr #6 )
610
-
THUMB( lsl r8, r8, #2 )
612
+
THUMB( lsr r8, r8, #6 )
611
613
THUMB( add pc, r8 )
612
614
nop
613
615