Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67f3a588 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4e19025b

arch/arm/mm/ioremap.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -303,7 +303,6 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size, 
	int err;

	int err;

	unsigned long addr;

	unsigned long addr;

 	struct vm_struct * area;

 	struct vm_struct * area;

	unsigned int cr = get_cr();





	/*

	/*

	 * High mappings must be supersection aligned

	 * 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;

 	addr = (unsigned long)area->addr;





#ifndef CONFIG_SMP

#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()) &&

	       cpu_is_xsc3()) &&

	       !((__pfn_to_phys(pfn) | size | addr) & ~SUPERSECTION_MASK)) {

	       !((__pfn_to_phys(pfn) | size | addr) & ~SUPERSECTION_MASK)) {

		area->flags |= VM_ARM_SECTION_MAPPING;

		area->flags |= VM_ARM_SECTION_MAPPING;