diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-08 13:24:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-08 13:24:29 +0100 |
| commit | bf06bec1f8b088965577b14eecaf532fe3ca1f58 (patch) | |
| tree | 68717606745d17d6dff26c849d3db0cd1490d3b1 /arch/x86 | |
| parent | 965abff8d8accdffc4af1b11fcf580e83031330a (diff) | |
| parent | 85cdabba08d484bdcc4b25f0bbc23ac60c75aa5b (diff) | |
Merge tag 'v3.10.11' into linux-linaro-lsk
This is the 3.10.11 stable release
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 1f34e921977..7a5bf1b76e2 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) { |