tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

Pull ARM fixes from Russell King:
"Just three this time, all really quite small"

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: 7729/1: vfp: ensure VFP_arch is non-zero when VFP is not supported
ARM: 7727/1: remove the .vm_mm value from gate_vma
ARM: 7723/1: crypto: sha1-armv4-large.S: fix SP handling

Linus Torvalds 4dd9aa89 9cf18482

+2 -3
+1 -1
arch/arm/crypto/sha1-armv4-large.S
··· 195 195 add r3,r3,r10 @ E+=F_00_19(B,C,D) 196 196 cmp r14,sp 197 197 bne .L_00_15 @ [((11+4)*5+2)*3] 198 + sub sp,sp,#25*4 198 199 #if __ARM_ARCH__<7 199 200 ldrb r10,[r1,#2] 200 201 ldrb r9,[r1,#3] ··· 291 290 add r3,r3,r10 @ E+=F_00_19(B,C,D) 292 291 293 292 ldr r8,.LK_20_39 @ [+15+16*4] 294 - sub sp,sp,#25*4 295 293 cmn sp,#0 @ [+3], clear carry to denote 20_39 296 294 .L_20_39_or_60_79: 297 295 ldr r9,[r14,#15*4]
-1
arch/arm/kernel/process.c
··· 411 411 .vm_start = 0xffff0000, 412 412 .vm_end = 0xffff0000 + PAGE_SIZE, 413 413 .vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC, 414 - .vm_mm = &init_mm, 415 414 }; 416 415 417 416 static int __init gate_vma_init(void)
+1 -1
arch/arm/vfp/entry.S
··· 60 60 str r11, [r10, #TI_PREEMPT] 61 61 #endif 62 62 ldr r0, VFP_arch_address 63 - str r5, [r0] @ known non-zero value 63 + str r0, [r0] @ set to non-zero value 64 64 mov pc, r9 @ we have handled the fault 65 65 ENDPROC(vfp_testing_entry) 66 66