diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-21 18:15:24 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-21 18:15:24 +0400 |
| commit | 4175160b065e74572819a320dcd34129224a4e1c (patch) | |
| tree | 3298e2c9a7c7db33bf28617875e5429e17eec61c /arch/arm/mm/proc-arm1026.S | |
| parent | ddf90a2ff2c4a9da99acc898a4afeab3e4251fcd (diff) | |
| parent | 0ec8e7aa8f63f0cacd545fcd7f40f93fde2c0e6e (diff) | |
| download | linux-4175160b065e74572819a320dcd34129224a4e1c.tar.xz | |
Merge branch 'misc' into for-linus
Conflicts:
arch/arm/kernel/ptrace.c
Diffstat (limited to 'arch/arm/mm/proc-arm1026.S')
| -rw-r--r-- | arch/arm/mm/proc-arm1026.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S index 3eb9c3c26c75..fbc1d5fc24dc 100644 --- a/arch/arm/mm/proc-arm1026.S +++ b/arch/arm/mm/proc-arm1026.S @@ -218,6 +218,7 @@ ENTRY(arm1026_coherent_user_range) cmp r0, r1 blo 1b mcr p15, 0, ip, c7, c10, 4 @ drain WB + mov r0, #0 mov pc, lr /* |