aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-07-03 08:30:52 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-07-03 08:30:52 -0400
commit67f3a58856b6a41a46e9256a79a8ca3809f47cc6 (patch)
treebb1d2a66ff351976d6e7e3ba0a143641976cdbd8 /arch
parent4e19025bc7be18e4d1dc8d1fde06c2d23927eb4d (diff)
[ARM] Fix warning in consistent.c
No need for 'cr' to be a local variable, which is unused in the SMP case, and only used once in the UP case. Just call get_cr() directly. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mm/ioremap.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 3e86fe7c333d..dba7dddfe57d 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -303,7 +303,6 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,
303 int err; 303 int err;
304 unsigned long addr; 304 unsigned long addr;
305 struct vm_struct * area; 305 struct vm_struct * area;
306 unsigned int cr = get_cr();
307 306
308 /* 307 /*
309 * High mappings must be supersection aligned 308 * High mappings must be supersection aligned
@@ -317,7 +316,7 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,
317 addr = (unsigned long)area->addr; 316 addr = (unsigned long)area->addr;
318 317
319#ifndef CONFIG_SMP 318#ifndef CONFIG_SMP
320 if ((((cpu_architecture() >= CPU_ARCH_ARMv6) && (cr & CR_XP)) || 319 if ((((cpu_architecture() >= CPU_ARCH_ARMv6) && (get_cr() & CR_XP)) ||
321 cpu_is_xsc3()) && 320 cpu_is_xsc3()) &&
322 !((__pfn_to_phys(pfn) | size | addr) & ~SUPERSECTION_MASK)) { 321 !((__pfn_to_phys(pfn) | size | addr) & ~SUPERSECTION_MASK)) {
323 area->flags |= VM_ARM_SECTION_MAPPING; 322 area->flags |= VM_ARM_SECTION_MAPPING;