diff options
| author | Olof Johansson <olof@lixom.net> | 2012-01-06 12:44:35 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-01-06 12:44:35 -0800 |
| commit | 6d0a5636fba5a3f82ec80ab124dd4748344549c3 (patch) | |
| tree | eb6d09f90c370696dd21f46baf6bdc6d36abb8c1 /arch | |
| parent | 038485ea9b66858c17f82e5393004532825106a7 (diff) | |
| parent | 7996bad8e62d8ca5888a935185ce313e693814b2 (diff) | |
| download | linux-6d0a5636fba5a3f82ec80ab124dd4748344549c3.tar.bz2 | |
Merge branch 'imx6/pm' into next/pm
* imx6/pm:
ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1
ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidation
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/head-v7.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/head-v7.S b/arch/arm/mach-imx/head-v7.S index cec23a857c7e..7e49deb128a4 100644 --- a/arch/arm/mach-imx/head-v7.S +++ b/arch/arm/mach-imx/head-v7.S @@ -16,7 +16,6 @@ #include <asm/hardware/cache-l2x0.h> .section ".text.head", "ax" - __CPUINIT /* * The secondary kernel init calls v7_flush_dcache_all before it enables @@ -33,6 +32,7 @@ */ ENTRY(v7_invalidate_l1) mov r0, #0 + mcr p15, 0, r0, c7, c5, 0 @ invalidate I cache mcr p15, 2, r0, c0, c0, 0 mrc p15, 1, r0, c0, c0, 0 |