summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/cache-armv7.S
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2010-10-04 08:32:52 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-10-04 08:32:52 +0200
commit43c1881110b28f42c58d45465a6b8cad06540ad0 (patch)
tree4b964b15e2ed7e6acd6e375c39e575348fd988a2 /arch/arm/cpu/cache-armv7.S
parent849e910d07a2e6d9f1e8562f2d6ce1adf0034c51 (diff)
parent81d2b141e709505fcdf9a6c4df160894ddf28667 (diff)
downloadbarebox-43c1881110b28f42c58d45465a6b8cad06540ad0.tar.gz
barebox-43c1881110b28f42c58d45465a6b8cad06540ad0.tar.xz
Merge branch 'next'
Diffstat (limited to 'arch/arm/cpu/cache-armv7.S')
-rw-r--r--arch/arm/cpu/cache-armv7.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/cache-armv7.S b/arch/arm/cpu/cache-armv7.S
index a303dc1285..79bc24358c 100644
--- a/arch/arm/cpu/cache-armv7.S
+++ b/arch/arm/cpu/cache-armv7.S
@@ -1,4 +1,5 @@
#include <linux/linkage.h>
+#include <init.h>
ENTRY(__mmu_cache_on)
mov r12, lr
@@ -49,7 +50,7 @@ ENTRY(__mmu_cache_off)
mov pc, r12
ENDPROC(__mmu_cache_on)
-.section ".text_bare_init.text"
+__BARE_INIT
ENTRY(__mmu_cache_flush)
mrc p15, 0, r10, c0, c1, 5 @ read ID_MMFR1
tst r10, #0xf << 16 @ hierarchical cache (ARMv7)