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

Commit 9f8305fe authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

x86-64: reduce boot fixmap space 



Just like for 32-bit - as 256 entries are needed, aligning to a
256-entry boundary is sufficient and still guarantees the single pte
table requirement.

Likewise move up __end_of_permanent_fixed_addresses, to match 32-bit.

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 4480f15b

include/asm-x86/fixmap_64.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ enum fixed_addresses { 
#ifdef CONFIG_PARAVIRT

#ifdef CONFIG_PARAVIRT

	FIX_PARAVIRT_BOOTMAP,

	FIX_PARAVIRT_BOOTMAP,

#endif

#endif

	__end_of_permanent_fixed_addresses,

#ifdef CONFIG_ACPI

#ifdef CONFIG_ACPI

	FIX_ACPI_BEGIN,

	FIX_ACPI_BEGIN,

	FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,

	FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,
@@ -56,18 +57,17 @@ enum fixed_addresses { 
#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT

#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT

	FIX_OHCI1394_BASE,

	FIX_OHCI1394_BASE,

#endif

#endif

	__end_of_permanent_fixed_addresses,

	/*

	/*

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

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

	 * before ioremap() is functional.

	 * before ioremap() is functional.

	 *

	 *

	 * We round it up to the next 512 pages boundary so that we

	 * We round it up to the next 256 pages boundary so that we

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

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

	 */

	 */

#define NR_FIX_BTMAPS		64

#define NR_FIX_BTMAPS		64

#define FIX_BTMAPS_NESTING	4

#define FIX_BTMAPS_NESTING	4

	FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 512 -

	FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 256 -

			(__end_of_permanent_fixed_addresses & 511),

			(__end_of_permanent_fixed_addresses & 255),

	FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_NESTING - 1,

	FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_NESTING - 1,

	__end_of_fixed_addresses

	__end_of_fixed_addresses

};

};