diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 22:18:59 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 22:18:59 +0200 |
| commit | a9dd3865dd1bd996a7e6af808645b7e566ced009 (patch) | |
| tree | 4a11fe3663f1e7c375bb8d33af85d8b1ad5e5ad5 /arch/arm/mm | |
| parent | Merge branch 'devel-stable' into for-next (diff) | |
| parent | ARM: fix EFM32 build breakage caused by cpu_resume_arm (diff) | |
| download | linux-a9dd3865dd1bd996a7e6af808645b7e566ced009.tar.xz linux-a9dd3865dd1bd996a7e6af808645b7e566ced009.zip | |
Merge branch 'for-arm-soc' into for-next
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/proc-v7.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 003190ae9cd8..0716bbe19872 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -414,7 +414,7 @@ __v7_pj4b_setup: __v7_setup: adr r12, __v7_setup_stack @ the local stack stmia r12, {r0-r5, r7, r9, r11, lr} - bl v7_flush_dcache_louis + bl v7_invalidate_l1 ldmia r12, {r0-r5, r7, r9, r11, lr} and r0, r9, #0xff000000 @ ARM? |