diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-07-09 22:32:33 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-16 11:07:30 +0200 |
| commit | 6596f2422306a05be2170efc114da49f26a047dd (patch) | |
| tree | 5c3e84d2352a87ac8091f8d3f5aef415edc60f91 /arch | |
| parent | Revert "suspend, xen: enable PM_SLEEP for CONFIG_XEN" (diff) | |
| download | linux-dev-6596f2422306a05be2170efc114da49f26a047dd.tar.xz linux-dev-6596f2422306a05be2170efc114da49f26a047dd.zip | |
Revert "x86_64: there's no need to preallocate level1_fixmap_pgt"
This reverts commit 033786969d1d1b5af12a32a19d3a760314d05329.
Suresh Siddha reported that this broke booting on his 2GB testbox.
Reported-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/head_64.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 2240f823676a..db3280afe886 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -362,6 +362,12 @@ NEXT_PAGE(level3_kernel_pgt) .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE NEXT_PAGE(level2_fixmap_pgt) + .fill 506,8,0 + .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE + /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */ + .fill 5,8,0 + +NEXT_PAGE(level1_fixmap_pgt) .fill 512,8,0 NEXT_PAGE(level2_ident_pgt) |