mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
update ar7 to 2.6.22.1 (thanks to Matteo Croce for his great help)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8189 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -60,132 +60,13 @@ static int __init memsize(void)
|
||||
return size;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_NEED_MULTIPLE_NODES
|
||||
static bootmem_data_t node_bootmem_data;
|
||||
pg_data_t __node_data[1] = {
|
||||
{
|
||||
.bdata = &node_bootmem_data
|
||||
},
|
||||
};
|
||||
EXPORT_SYMBOL(__node_data);
|
||||
|
||||
unsigned long max_mapnr;
|
||||
struct page *mem_map;
|
||||
EXPORT_SYMBOL(max_mapnr);
|
||||
EXPORT_SYMBOL(mem_map);
|
||||
|
||||
static unsigned long setup_zero_pages(void)
|
||||
{
|
||||
unsigned int order = 3;
|
||||
unsigned long size;
|
||||
struct page *page;
|
||||
|
||||
empty_zero_page = __get_free_pages(GFP_KERNEL | __GFP_ZERO, order);
|
||||
if (!empty_zero_page)
|
||||
panic("Oh boy, that early out of memory?");
|
||||
|
||||
page = virt_to_page(empty_zero_page);
|
||||
split_page(page, order);
|
||||
while (page < virt_to_page(empty_zero_page + (PAGE_SIZE << order))) {
|
||||
SetPageReserved(page);
|
||||
page++;
|
||||
}
|
||||
|
||||
size = PAGE_SIZE << order;
|
||||
zero_page_mask = (size - 1) & PAGE_MASK;
|
||||
|
||||
return 1UL << order;
|
||||
}
|
||||
|
||||
extern void pagetable_init(void);
|
||||
|
||||
void __init paging_init(void)
|
||||
{
|
||||
unsigned long zones_size[MAX_NR_ZONES] = { 0, };
|
||||
|
||||
pagetable_init();
|
||||
|
||||
zones_size[ZONE_DMA] = max_low_pfn - min_low_pfn;
|
||||
|
||||
free_area_init_node(0, NODE_DATA(0), zones_size, ARCH_PFN_OFFSET, NULL);
|
||||
}
|
||||
|
||||
static struct kcore_list kcore_mem, kcore_vmalloc;
|
||||
|
||||
void __init mem_init(void)
|
||||
{
|
||||
unsigned long codesize, reservedpages, datasize, initsize;
|
||||
unsigned long tmp, ram;
|
||||
unsigned long kernel_start, kernel_end;
|
||||
|
||||
kernel_start = PFN_DOWN(CPHYSADDR((unsigned long)&_text));
|
||||
kernel_end = PFN_UP(CPHYSADDR((unsigned long)&_end));
|
||||
for (tmp = min_low_pfn + 1; tmp < kernel_start; tmp++) {
|
||||
ClearPageReserved(pfn_to_page(tmp));
|
||||
init_page_count(pfn_to_page(tmp));
|
||||
free_page((unsigned long)__va(tmp << PAGE_SHIFT));
|
||||
}
|
||||
|
||||
totalram_pages += free_all_bootmem();
|
||||
totalram_pages -= setup_zero_pages(); /* Setup zeroed pages. */
|
||||
|
||||
reservedpages = ram = 0;
|
||||
for (tmp = min_low_pfn; tmp <= max_low_pfn; tmp++) {
|
||||
ram++;
|
||||
if (PageReserved(pfn_to_page(tmp)))
|
||||
if ((tmp < kernel_start) || (tmp > kernel_end))
|
||||
reservedpages++;
|
||||
}
|
||||
num_physpages = ram;
|
||||
|
||||
codesize = (unsigned long) &_etext - (unsigned long) &_text;
|
||||
datasize = (unsigned long) &_edata - (unsigned long) &_etext;
|
||||
initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
|
||||
|
||||
kclist_add(&kcore_mem, __va(min_low_pfn),
|
||||
(max_low_pfn - min_low_pfn) << PAGE_SHIFT);
|
||||
kclist_add(&kcore_vmalloc, (void *)VMALLOC_START,
|
||||
VMALLOC_END - VMALLOC_START);
|
||||
|
||||
printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "
|
||||
"%ldk reserved, %ldk data, %ldk init)\n",
|
||||
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
|
||||
ram << (PAGE_SHIFT-10),
|
||||
codesize >> 10,
|
||||
reservedpages << (PAGE_SHIFT-10),
|
||||
datasize >> 10,
|
||||
initsize >> 10);
|
||||
}
|
||||
#endif
|
||||
|
||||
void __init prom_meminit(void)
|
||||
{
|
||||
unsigned long pages;
|
||||
#ifdef CONFIG_NEED_MULTIPLE_NODES
|
||||
unsigned long kernel_start, kernel_end;
|
||||
unsigned long free_pages;
|
||||
unsigned long bootmap_size;
|
||||
#endif
|
||||
|
||||
pages = memsize() >> PAGE_SHIFT;
|
||||
add_memory_region(ARCH_PFN_OFFSET << PAGE_SHIFT, pages <<
|
||||
PAGE_SHIFT, BOOT_MEM_RAM);
|
||||
|
||||
#ifdef CONFIG_NEED_MULTIPLE_NODES
|
||||
kernel_start = PFN_DOWN(CPHYSADDR((unsigned long)&_text));
|
||||
kernel_end = PFN_UP(CPHYSADDR((unsigned long)&_end));
|
||||
min_low_pfn = ARCH_PFN_OFFSET;
|
||||
max_low_pfn = ARCH_PFN_OFFSET + pages;
|
||||
max_mapnr = max_low_pfn;
|
||||
free_pages = pages - (kernel_end - min_low_pfn);
|
||||
bootmap_size = init_bootmem_node(NODE_DATA(0), kernel_end,
|
||||
ARCH_PFN_OFFSET, max_low_pfn);
|
||||
|
||||
free_bootmem(PFN_PHYS(kernel_end), free_pages << PAGE_SHIFT);
|
||||
memory_present(0, min_low_pfn, max_low_pfn);
|
||||
reserve_bootmem(PFN_PHYS(kernel_end), bootmap_size);
|
||||
mem_map = NODE_DATA(0)->node_mem_map;
|
||||
#endif
|
||||
}
|
||||
|
||||
void __init prom_free_prom_memory(void)
|
||||
|
||||
Reference in New Issue
Block a user