Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 18017
b: refs/heads/master
c: 6c5acd1
h: refs/heads/master
i:
  18015: 6cfd7d5
v: v3
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Jan 12, 2006
1 parent fa680cb commit dec0284
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0a9c3ee7692fa20670986bcf550950e88ab9b4cc
refs/heads/master: 6c5acd160a10c76e8debf4f8fa8256d7c914f290
16 changes: 14 additions & 2 deletions trunk/arch/x86_64/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -255,14 +255,26 @@ static void __init phys_pud_init(pud_t *pud, unsigned long address, unsigned lon

static void __init find_early_table_space(unsigned long end)
{
unsigned long puds, pmds, tables;
unsigned long puds, pmds, tables, start;

puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
pmds = (end + PMD_SIZE - 1) >> PMD_SHIFT;
tables = round_up(puds * sizeof(pud_t), PAGE_SIZE) +
round_up(pmds * sizeof(pmd_t), PAGE_SIZE);

table_start = find_e820_area(0x8000, __pa_symbol(&_text), tables);
/* Put page tables beyond the DMA zones if possible.
RED-PEN might be better to spread them out more over
memory to avoid hotspots */
if (end > MAX_DMA32_PFN<<PAGE_SHIFT)
start = MAX_DMA32_PFN << PAGE_SHIFT;
else if (end > MAX_DMA_PFN << PAGE_SHIFT)
start = MAX_DMA_PFN << PAGE_SHIFT;
else
start = 0x8000;

table_start = find_e820_area(start, end, tables);
if (table_start == -1)
table_start = find_e820_area(0x8000, end, tables);
if (table_start == -1UL)
panic("Cannot find space for the kernel page tables");

Expand Down

0 comments on commit dec0284

Please sign in to comment.