From eecfa8cdde4cc840e39eacac3ff4b0a9efe0931d Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Thu, 25 Jan 2007 14:16:47 +0100 Subject: [PATCH] --- yaml --- r: 45929 b: refs/heads/master c: 412489af76b5c0e4029d4406d93554c22a88fc73 h: refs/heads/master i: 45927: a0d8ff1d0ecda29ff9c9973736c056d42e1019bc v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/ioremap.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7bab33bd2bf6..689207b164ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7baced8a5923ce13d3d42d50a042a869092ab4e5 +refs/heads/master: 412489af76b5c0e4029d4406d93554c22a88fc73 diff --git a/trunk/arch/arm/mm/ioremap.c b/trunk/arch/arm/mm/ioremap.c index 251685fe73a8..0ac615c0f798 100644 --- a/trunk/arch/arm/mm/ioremap.c +++ b/trunk/arch/arm/mm/ioremap.c @@ -300,7 +300,8 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size, addr = (unsigned long)area->addr; #ifndef CONFIG_SMP - if ((((cpu_architecture() >= CPU_ARCH_ARMv6) && (get_cr() & CR_XP)) || + if (DOMAIN_IO == 0 && + (((cpu_architecture() >= CPU_ARCH_ARMv6) && (get_cr() & CR_XP)) || cpu_is_xsc3()) && !((__pfn_to_phys(pfn) | size | addr) & ~SUPERSECTION_MASK)) { area->flags |= VM_ARM_SECTION_MAPPING;