2013-09-01 11:28:44

by H. Peter Anvin

[permalink] [raw]
Subject: [GIT PULL] x86 fixes for v3.11-rc8

Hi Linus,

A single very small boot fix for very large memory systems (> 0.5T).

The following changes since commit fd3930f70c8d14008f3377d51ce039806dfc542e:

proc: more readdir conversion bug-fixes (2013-08-19 16:26:12 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus

The head of this tree is 527bf129f9a780e11b251cf2467dc30118a57d16.

x86/mm: Fix boot crash with DEBUG_PAGE_ALLOC=y and more than 512G RAM (2013-08-20 10:06:50 +0200)

----------------------------------------------------------------
Yinghai Lu (1):
x86/mm: Fix boot crash with DEBUG_PAGE_ALLOC=y and more than 512G RAM

arch/x86/mm/init.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 2ec29ac..04664cd 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)
{