aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-23 19:54:31 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-23 19:54:31 +0000
commit52e8bfd81af5492a14cc3a4641d4c80d05b66bdb (patch)
tree1489eb5f4ecac93071fc9995afa298a5a3f10e92
parentd9fd3ab89ff58ca70c8cc0eadc87cd4a96950f95 (diff)
downloadlinux-linaro-52e8bfd81af5492a14cc3a4641d4c80d05b66bdb.tar.gz
ARM: Fix wrong shared bit for CPU write buffer bug test
It is unpredictable to have the same memory mapped using different shared bit settings for ARMv6 and ARMv7 CPUs. Fix this for the CPU write buffer bug test. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mm/fault-armv.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c
index 72960229195..56ee15321b0 100644
--- a/arch/arm/mm/fault-armv.c
+++ b/arch/arm/mm/fault-armv.c
@@ -207,9 +207,8 @@ void __init check_writebuffer_bugs(void)
page = alloc_page(GFP_KERNEL);
if (page) {
unsigned long *p1, *p2;
- pgprot_t prot = __pgprot(L_PTE_PRESENT|L_PTE_YOUNG|
- L_PTE_DIRTY|L_PTE_WRITE|
- L_PTE_MT_BUFFERABLE);
+ pgprot_t prot = __pgprot_modify(PAGE_KERNEL,
+ L_PTE_MT_MASK, L_PTE_MT_BUFFERABLE);
p1 = vmap(&page, 1, VM_IOREMAP, prot);
p2 = vmap(&page, 1, VM_IOREMAP, prot);