From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 3 Jul 2006 12:30:52 +0000 (+0100)
Subject: [ARM] Fix warning in consistent.c
X-Git-Tag: v2.6.18-rc1~19^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67f3a58856b6a41a46e9256a79a8ca3809f47cc6;p=linux-2.6

[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>
---

diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 3e86fe7c33..dba7dddfe5 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,
 	int err;
 	unsigned long addr;
  	struct vm_struct * area;
-	unsigned int cr = get_cr();
 
 	/*
 	 * High mappings must be supersection aligned
@@ -317,7 +316,7 @@ __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) && (cr & CR_XP)) ||
+	if ((((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;