aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-16 20:06:20 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-16 20:06:20 +0000
commit1cc76b5ee02e4e884339ee3baf43cafd26dd4f1b (patch)
tree480f1e88d9966a913a67f63f74d5486363903fff /arch/arm/mm
parent8bea8672edfca7ec5f661cafb218f1205863b343 (diff)
parent1cb9f9b086f818eb9543ed759382de7b95c67f87 (diff)
Merge branch 'for-rmk' of git://git.marvell.com/orion
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/proc-v6.S5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index 5485c821101..395cc90c661 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -254,10 +254,9 @@ __pj4_v6_proc_info:
.long 0x560f5810
.long 0xff0ffff0
.long PMD_TYPE_SECT | \
- PMD_SECT_BUFFERABLE | \
- PMD_SECT_CACHEABLE | \
PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
+ PMD_SECT_AP_READ | \
+ PMD_FLAGS
.long PMD_TYPE_SECT | \
PMD_SECT_XN | \
PMD_SECT_AP_WRITE | \