diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-07-03 13:30:52 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-07-03 13:30:52 +0100 |
| commit | 67f3a58856b6a41a46e9256a79a8ca3809f47cc6 (patch) | |
| tree | bb1d2a66ff351976d6e7e3ba0a143641976cdbd8 /arch | |
| parent | 4e19025bc7be18e4d1dc8d1fde06c2d23927eb4d (diff) | |
| download | kernel_samsung_crespo-67f3a58856b6a41a46e9256a79a8ca3809f47cc6.zip kernel_samsung_crespo-67f3a58856b6a41a46e9256a79a8ca3809f47cc6.tar.gz kernel_samsung_crespo-67f3a58856b6a41a46e9256a79a8ca3809f47cc6.tar.bz2 | |
[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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index 3e86fe7..dba7ddd 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; |