diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-23 20:36:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-23 20:36:05 +0000 |
| commit | 15f82fce54b86e159fe5a1d41dcdc89e12b26459 (patch) | |
| tree | c42632581244e8428e0623c5f11cd81b983d2eed /arch/arm64/include/asm/page.h | |
| parent | f1326e0892329b0d58dec467f71f5d94c4d5d5a9 (diff) | |
| parent | 9698ac7c353d6f22100c9fa24a830cae6a466cb4 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsklsk-v3.10-15.01
Conflicts:
arch/arm64/include/asm/proc-fns.h
arch/arm64/kernel/debug-monitors.c
arch/arm64/kernel/psci.c
Diffstat (limited to 'arch/arm64/include/asm/page.h')
| -rw-r--r-- | arch/arm64/include/asm/page.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h index a6331e6a92b5..e84ca637af6b 100644 --- a/arch/arm64/include/asm/page.h +++ b/arch/arm64/include/asm/page.h @@ -33,11 +33,11 @@ /* * The idmap and swapper page tables need some space reserved in the kernel - * image. The idmap only requires a pgd and a next level table to (section) map - * the kernel, while the swapper also maps the FDT and requires an additional - * table to map an early UART. See __create_page_tables for more information. + * image. Both require a pgd and a next level table to (section) map the + * kernel. The the swapper also maps the FDT (see __create_page_tables for + * more information). */ -#define SWAPPER_DIR_SIZE (3 * PAGE_SIZE) +#define SWAPPER_DIR_SIZE (2 * PAGE_SIZE) #define IDMAP_DIR_SIZE (2 * PAGE_SIZE) #ifndef __ASSEMBLY__ |