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

Commit 43657ffb authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'efi-urgent' of... 

Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi

 into x86/urgent

Pull EFI fix from Matt Fleming:

  * Increase the number of early_ioremap() slots to fix a regression with
    earlyprintk=efi after recent changes to the ACPI code (Dave Young)

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 5ac385d8 3eddc69f

arch/x86/include/asm/fixmap.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -106,14 +106,14 @@ enum fixed_addresses { 
	__end_of_permanent_fixed_addresses,

	__end_of_permanent_fixed_addresses,





	/*

	/*

	 * 256 temporary boot-time mappings, used by early_ioremap(),

	 * 512 temporary boot-time mappings, used by early_ioremap(),

	 * before ioremap() is functional.

	 * before ioremap() is functional.

	 *

	 *

	 * If necessary we round it up to the next 256 pages boundary so

	 * If necessary we round it up to the next 512 pages boundary so

	 * that we can have a single pgd entry and a single pte table:

	 * that we can have a single pgd entry and a single pte table:

	 */

	 */

#define NR_FIX_BTMAPS		64

#define NR_FIX_BTMAPS		64

#define FIX_BTMAPS_SLOTS	4

#define FIX_BTMAPS_SLOTS	8

#define TOTAL_FIX_BTMAPS	(NR_FIX_BTMAPS * FIX_BTMAPS_SLOTS)

#define TOTAL_FIX_BTMAPS	(NR_FIX_BTMAPS * FIX_BTMAPS_SLOTS)

	FIX_BTMAP_END =

	FIX_BTMAP_END =

	 (__end_of_permanent_fixed_addresses ^

	 (__end_of_permanent_fixed_addresses ^