Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e09a1fa9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ac0bc789 527bf129

arch/x86/mm/init.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -78,8 +78,8 @@ __ref void *alloc_low_pages(unsigned int num) 
	return __va(pfn << PAGE_SHIFT);

	return __va(pfn << PAGE_SHIFT);

}

}





/* need 4 4k for initial PMD_SIZE, 4k for 0-ISA_END_ADDRESS */

/* need 3 4k for initial PMD_SIZE,  3 4k for 0-ISA_END_ADDRESS */

#define INIT_PGT_BUF_SIZE	(5 * PAGE_SIZE)

#define INIT_PGT_BUF_SIZE	(6 * PAGE_SIZE)

RESERVE_BRK(early_pgt_alloc, INIT_PGT_BUF_SIZE);

RESERVE_BRK(early_pgt_alloc, INIT_PGT_BUF_SIZE);

void  __init early_alloc_pgt_buf(void)

void  __init early_alloc_pgt_buf(void)

{

{