summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-02 09:55:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-02 09:55:14 -0700
commite09a1fa9be6ec5be07edfdeedbca2f11eeac1360 (patch)
tree3f44dec88297b3745a874e709a1a07d0094f55ef /arch/x86/mm
parentac0bc7899afc5b69abff64472e2ac4869fd97ff6 (diff)
parent527bf129f9a780e11b251cf2467dc30118a57d16 (diff)
downloadblackbird-op-linux-e09a1fa9be6ec5be07edfdeedbca2f11eeac1360.tar.gz
blackbird-op-linux-e09a1fa9be6ec5be07edfdeedbca2f11eeac1360.zip
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 boot fix from Peter Anvin: "A single very small boot fix for very large memory systems (> 0.5T)" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/mm: Fix boot crash with DEBUG_PAGE_ALLOC=y and more than 512G RAM
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 2ec29ac78ae6..04664cdb7fda 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -78,8 +78,8 @@ __ref void *alloc_low_pages(unsigned int num)
return __va(pfn << PAGE_SHIFT);
}
-/* need 4 4k for initial PMD_SIZE, 4k for 0-ISA_END_ADDRESS */
-#define INIT_PGT_BUF_SIZE (5 * PAGE_SIZE)
+/* need 3 4k for initial PMD_SIZE, 3 4k for 0-ISA_END_ADDRESS */
+#define INIT_PGT_BUF_SIZE (6 * PAGE_SIZE)
RESERVE_BRK(early_pgt_alloc, INIT_PGT_BUF_SIZE);
void __init early_alloc_pgt_buf(void)
{
OpenPOWER on IntegriCloud