Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit e09a1fa9be6e · 2013-09-02T09:55:14.000-07:00
Pull x86 boot fix from Peter Anvin:
 "A single very small boot fix for very large memory systems (&gt; 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
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,8 @@ __ref void *alloc_low_pages(unsigned int num)`
`78`	`78`	`return __va(pfn << PAGE_SHIFT);`
`79`	`79`	`}`
`80`	`80`
`81`		`-/* need 4 4k for initial PMD_SIZE, 4k for 0-ISA_END_ADDRESS */`
`82`		`-#define INIT_PGT_BUF_SIZE (5 * PAGE_SIZE)`
	`81`	`+/* need 3 4k for initial PMD_SIZE, 3 4k for 0-ISA_END_ADDRESS */`
	`82`	`+#define INIT_PGT_BUF_SIZE (6 * PAGE_SIZE)`
`83`	`83`	`RESERVE_BRK(early_pgt_alloc, INIT_PGT_BUF_SIZE);`
`84`	`84`	`void __init early_alloc_pgt_buf(void)`
`85`	`85`	`{`