lkml.org 
[lkml]   [2008]   [Jul]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [patch] tip/x86_64: fix e820 merge issue which broke max_pfn_mapped

* Jeremy Fitzhardinge <jeremy@goop.org> wrote:

>>> level1_fixmap_pgt" be a problem in itself? It seems sound to me,
>>> but
>>>
>>
>> Yep. Reverting it made my system with 2GB memory boot fine again.
>
> Great. Ingo, would you do the honours of shooting that patch?

done, i've applied the revert below.

Ingo

----------->
commit 8e48d49043b716d2331facba9ecf0b34936ee8ea
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jul 9 22:32:33 2008 +0200
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>

diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index 2240f82..db3280a 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)

\
 
 \ /
  Last update: 2008-07-09 22:37    [from the cache]
©2003-2011 Jasper Spaans