Commit 4dd9aa89 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 9cf18482 f27d6e17
...@@ -195,6 +195,7 @@ ENTRY(sha1_block_data_order) ...@@ -195,6 +195,7 @@ ENTRY(sha1_block_data_order)
add r3,r3,r10 @ E+=F_00_19(B,C,D) add r3,r3,r10 @ E+=F_00_19(B,C,D)
cmp r14,sp cmp r14,sp
bne .L_00_15 @ [((11+4)*5+2)*3] bne .L_00_15 @ [((11+4)*5+2)*3]
sub sp,sp,#25*4
#if __ARM_ARCH__<7 #if __ARM_ARCH__<7
ldrb r10,[r1,#2] ldrb r10,[r1,#2]
ldrb r9,[r1,#3] ldrb r9,[r1,#3]
...@@ -290,7 +291,6 @@ ENTRY(sha1_block_data_order) ...@@ -290,7 +291,6 @@ ENTRY(sha1_block_data_order)
add r3,r3,r10 @ E+=F_00_19(B,C,D) add r3,r3,r10 @ E+=F_00_19(B,C,D)
ldr r8,.LK_20_39 @ [+15+16*4] ldr r8,.LK_20_39 @ [+15+16*4]
sub sp,sp,#25*4
cmn sp,#0 @ [+3], clear carry to denote 20_39 cmn sp,#0 @ [+3], clear carry to denote 20_39
.L_20_39_or_60_79: .L_20_39_or_60_79:
ldr r9,[r14,#15*4] ldr r9,[r14,#15*4]
......
...@@ -411,7 +411,6 @@ static struct vm_area_struct gate_vma = { ...@@ -411,7 +411,6 @@ static struct vm_area_struct gate_vma = {
.vm_start = 0xffff0000, .vm_start = 0xffff0000,
.vm_end = 0xffff0000 + PAGE_SIZE, .vm_end = 0xffff0000 + PAGE_SIZE,
.vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC, .vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC,
.vm_mm = &init_mm,
}; };
static int __init gate_vma_init(void) static int __init gate_vma_init(void)
......
...@@ -60,7 +60,7 @@ ENTRY(vfp_testing_entry) ...@@ -60,7 +60,7 @@ ENTRY(vfp_testing_entry)
str r11, [r10, #TI_PREEMPT] str r11, [r10, #TI_PREEMPT]
#endif #endif
ldr r0, VFP_arch_address ldr r0, VFP_arch_address
str r5, [r0] @ known non-zero value str r0, [r0] @ set to non-zero value
mov pc, r9 @ we have handled the fault mov pc, r9 @ we have handled the fault
ENDPROC(vfp_testing_entry) ENDPROC(vfp_testing_entry)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment