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

Commit 562a4359 authored by Michał Mirosław's avatar Michał Mirosław Committed by Greg Kroah-Hartman
Browse files

ARM: 9155/1: fix early early_iounmap() 



commit 0d08e7bf0d0d1a29aff7b16ef516f7415eb1aa05 upstream.

Currently __set_fixmap() bails out with a warning when called in early boot
from early_iounmap(). Fix it, and while at it, make the comment a bit easier
to understand.

Cc: <stable@vger.kernel.org>
Fixes: b089c31c ("ARM: 8667/3: Fix memory attribute inconsistencies when using fixmap")
Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cd558849

arch/arm/mm/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -416,9 +416,9 @@ void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot) 
		     FIXADDR_END);

	BUG_ON(idx >= __end_of_fixed_addresses);



	/* we only support device mappings until pgprot_kernel has been set */

	/* We support only device mappings before pgprot_kernel is set. */

	if (WARN_ON(pgprot_val(prot) != pgprot_val(FIXMAP_PAGE_IO) &&

		    pgprot_val(pgprot_kernel) == 0))

		    pgprot_val(prot) && pgprot_val(pgprot_kernel) == 0))

		return;



	if (pgprot_val(prot))