diff options
author | Olof Johansson <olof@lixom.net> | 2012-01-06 21:44:05 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-01-06 21:44:05 +0100 |
commit | 7996bad8e62d8ca5888a935185ce313e693814b2 (patch) | |
tree | 143009838741ddff77315bdf4d8f41a7db6d3c5b /arch | |
parent | Merge branch 'imx/pm' of git://git.linaro.org/people/shawnguo/linux-2.6 into ... (diff) | |
parent | ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1 (diff) | |
download | linux-7996bad8e62d8ca5888a935185ce313e693814b2.tar.xz linux-7996bad8e62d8ca5888a935185ce313e693814b2.zip |
Merge branch 'imx/pm2' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm
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 |