|
@@ -227,6 +227,7 @@ void __init cleanup_highmap(void)
|
|
|
|
|
|
static unsigned long __initdata table_start;
|
|
static unsigned long __initdata table_start;
|
|
static unsigned long __meminitdata table_end;
|
|
static unsigned long __meminitdata table_end;
|
|
|
|
+static unsigned long __meminitdata table_top;
|
|
|
|
|
|
static __meminit void *alloc_low_page(unsigned long *phys)
|
|
static __meminit void *alloc_low_page(unsigned long *phys)
|
|
{
|
|
{
|
|
@@ -240,7 +241,7 @@ static __meminit void *alloc_low_page(unsigned long *phys)
|
|
return adr;
|
|
return adr;
|
|
}
|
|
}
|
|
|
|
|
|
- if (pfn >= end_pfn)
|
|
|
|
|
|
+ if (pfn >= table_top)
|
|
panic("alloc_low_page: ran out of memory");
|
|
panic("alloc_low_page: ran out of memory");
|
|
|
|
|
|
adr = early_ioremap(pfn * PAGE_SIZE, PAGE_SIZE);
|
|
adr = early_ioremap(pfn * PAGE_SIZE, PAGE_SIZE);
|
|
@@ -372,10 +373,10 @@ static void __init find_early_table_space(unsigned long end)
|
|
|
|
|
|
table_start >>= PAGE_SHIFT;
|
|
table_start >>= PAGE_SHIFT;
|
|
table_end = table_start;
|
|
table_end = table_start;
|
|
|
|
+ table_top = table_start + (tables >> PAGE_SHIFT);
|
|
|
|
|
|
- early_printk("kernel direct mapping tables up to %lx @ %lx-%lx\n",
|
|
|
|
- end, table_start << PAGE_SHIFT,
|
|
|
|
- (table_start << PAGE_SHIFT) + tables);
|
|
|
|
|
|
+ printk(KERN_DEBUG "kernel direct mapping tables up to %lx @ %lx-%lx\n",
|
|
|
|
+ end, table_start << PAGE_SHIFT, table_top << PAGE_SHIFT);
|
|
}
|
|
}
|
|
|
|
|
|
static void __init init_gbpages(void)
|
|
static void __init init_gbpages(void)
|