tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

authored by Russell King and committed by Russell King 67f3a588 4e19025b

+1 -2
unified split
+1 -2
arch/arm/mm/ioremap.c
··· 303 int err; 304 unsigned long addr; 305 struct vm_struct * area; 306 - unsigned int cr = get_cr(); 307 308 /* 309 * High mappings must be supersection aligned ··· 316 addr = (unsigned long)area->addr; 317 318 #ifndef CONFIG_SMP 319 - if ((((cpu_architecture() >= CPU_ARCH_ARMv6) && (cr & CR_XP)) || 320 cpu_is_xsc3()) && 321 !((__pfn_to_phys(pfn) | size | addr) & ~SUPERSECTION_MASK)) { 322 area->flags |= VM_ARM_SECTION_MAPPING;
··· 303 int err; 304 unsigned long addr; 305 struct vm_struct * area; 306 307 /* 308 * High mappings must be supersection aligned ··· 317 addr = (unsigned long)area->addr; 318 319 #ifndef CONFIG_SMP 320 + if ((((cpu_architecture() >= CPU_ARCH_ARMv6) && (get_cr() & CR_XP)) || 321 cpu_is_xsc3()) && 322 !((__pfn_to_phys(pfn) | size | addr) & ~SUPERSECTION_MASK)) { 323 area->flags |= VM_ARM_SECTION_MAPPING;