Prevent:
[    0.000000] ------------[ cut here ]------------
[    0.000000] WARNING: CPU: 0 PID: 0 at mm/early_ioremap.c:136 __early_ioremap.constprop.0+0x11f/0x1f1()
[    0.000000] Modules linked in:
[    0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 3.19.3-numascale44+ #1
[    0.000000] Hardware name: Supermicro AS -1042G-LTF/H8QGL, BIOS DS3.5a     11/13/2014
[    0.000000]  ffffffff8202e66c ffffffff82201c88 ffffffff81ac2c78 0000000000000001
[    0.000000]  0000000000000000 ffffffff82201cc8 ffffffff810a70b0 ffffffff82201ca8
[    0.000000]  0000000000000067 8000000000000163 0000000000000000 00000000d028eaec
[    0.000000] Call Trace:
[    0.000000]  [<ffffffff81ac2c78>] dump_stack+0x45/0x57
[    0.000000]  [<ffffffff810a70b0>] warn_slowpath_common+0x80/0xc0
[    0.000000]  [<ffffffff810a718d>] warn_slowpath_null+0x15/0x18
[    0.000000]  [<ffffffff8254a59d>] __early_ioremap.constprop.0+0x11f/0x1f1
[    0.000000]  [<ffffffff8254a82e>] early_ioremap+0x13/0x15
[    0.000000]  [<ffffffff82538323>] __acpi_map_table+0x13/0x18
[    0.000000]  [<ffffffff81abbd92>] acpi_os_map_iomem+0x22/0x14c
[    0.000000]  [<ffffffff81abbec5>] acpi_os_map_memory+0x9/0xb
[    0.000000]  [<ffffffff814dcb12>] acpi_tb_acquire_table+0x39/0x67
[    0.000000]  [<ffffffff814dcbfb>] acpi_tb_validate_table+0x23/0x34
[    0.000000]  [<ffffffff814de184>] acpi_get_table_with_size+0x62/0xbc
[    0.000000]  [<ffffffff825538fd>] ? acpi_table_print_srat_entry+0x22/0x22
[    0.000000]  [<ffffffff8253f229>] ? acpi_numa_arch_fixup+0x6/0x6
[    0.000000]  [<ffffffff8255229b>] acpi_table_parse+0x60/0x89
[    0.000000]  [<ffffffff82553a90>] acpi_numa_init+0x94/0xb1
[    0.000000]  [<ffffffff8253f232>] x86_acpi_numa_init+0x9/0x1b
[    0.000000]  [<ffffffff8253e910>] numa_init+0xdf/0x4f5
[    0.000000]  [<ffffffff8253ee0d>] x86_numa_init+0x27/0x2d
[    0.000000]  [<ffffffff8253ef9e>] initmem_init+0x9/0xb
[    0.000000]  [<ffffffff82531432>] setup_arch+0x995/0xa80
[    0.000000]  [<ffffffff8252c15d>] ? early_idt_handler+0x3d/0xa8
[    0.000000]  [<ffffffff8252cc1a>] start_kernel+0x90/0x432
[    0.000000]  [<ffffffff8252c5ad>] x86_64_start_reservations+0x2a/0x2c
[    0.000000]  [<ffffffff8252c67c>] x86_64_start_kernel+0xcd/0xd1
[    0.000000] ---[ end trace eb39e5225e2f11fd ]---

diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
index ffb1733..4b4e58a 100644
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@ -112,8 +112,8 @@ enum fixed_addresses {
 	 * 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:
 	 */
-#define NR_FIX_BTMAPS		64
-#define FIX_BTMAPS_SLOTS	8
+#define NR_FIX_BTMAPS		128
+#define FIX_BTMAPS_SLOTS	4
 #define TOTAL_FIX_BTMAPS	(NR_FIX_BTMAPS * FIX_BTMAPS_SLOTS)
 	FIX_BTMAP_END =
 	 (__end_of_permanent_fixed_addresses ^