The patch titled x86-64: reduce boot fixmap space has been added to the -mm tree. Its filename is x86-64-reduce-boot-fixmap-space.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: x86-64: reduce boot fixmap space From: Jan Beulich <jbeulich@xxxxxxxxxx> 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: Jan Beulich <jbeulich@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-x86/fixmap_64.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN include/asm-x86/fixmap_64.h~x86-64-reduce-boot-fixmap-space include/asm-x86/fixmap_64.h --- a/include/asm-x86/fixmap_64.h~x86-64-reduce-boot-fixmap-space +++ a/include/asm-x86/fixmap_64.h @@ -49,6 +49,7 @@ enum fixed_addresses { #ifdef CONFIG_PARAVIRT FIX_PARAVIRT_BOOTMAP, #endif + __end_of_permanent_fixed_addresses, #ifdef CONFIG_ACPI FIX_ACPI_BEGIN, FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1, @@ -56,18 +57,17 @@ enum fixed_addresses { #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT FIX_OHCI1394_BASE, #endif - __end_of_permanent_fixed_addresses, /* * 256 temporary boot-time mappings, used by early_ioremap(), * 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: */ #define NR_FIX_BTMAPS 64 #define FIX_BTMAPS_NESTING 4 - FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 512 - - (__end_of_permanent_fixed_addresses & 511), + FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 256 - + (__end_of_permanent_fixed_addresses & 255), FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_NESTING - 1, __end_of_fixed_addresses }; _ Patches currently in -mm which might be from jbeulich@xxxxxxxxxx are linux-next.patch x86-init-annotations-in-early_printk-setup.patch x86-adjust-dependencies-for-config_x86_cmov.patch x86-pgd_cdtor-cleanup.patch x86-x86_physvirt_bits-field-also-for-i386.patch x86-adjust-vmalloc_sync_all-for-xen-2nd-try.patch x86-fix-ticket-spin-lock-asm-constraints.patch x86-64-reduce-boot-fixmap-space.patch x86-64-add-two-__cpuinit-annotations.patch x86-64-eliminate-dead-code.patch x86-64-slightly-streamline-32-bit-syscall-entry-code.patch adjust-init-section-definitions.patch kconfig-eliminate-def_bool-n-constructs.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html