diff options
Diffstat (limited to 'arch/ppc/mm/init.c')
-rw-r--r-- | arch/ppc/mm/init.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c index 363c157e3617..334ef4150d92 100644 --- a/arch/ppc/mm/init.c +++ b/arch/ppc/mm/init.c | |||
@@ -96,9 +96,6 @@ extern struct task_struct *current_set[NR_CPUS]; | |||
96 | char *klimit = _end; | 96 | char *klimit = _end; |
97 | struct mem_pieces phys_avail; | 97 | struct mem_pieces phys_avail; |
98 | 98 | ||
99 | extern char *sysmap; | ||
100 | extern unsigned long sysmap_size; | ||
101 | |||
102 | /* | 99 | /* |
103 | * this tells the system to map all of ram with the segregs | 100 | * this tells the system to map all of ram with the segregs |
104 | * (i.e. page tables) instead of the bats. | 101 | * (i.e. page tables) instead of the bats. |
@@ -442,12 +439,6 @@ void __init mem_init(void) | |||
442 | if (agp_special_page) | 439 | if (agp_special_page) |
443 | SetPageReserved(virt_to_page(agp_special_page)); | 440 | SetPageReserved(virt_to_page(agp_special_page)); |
444 | #endif | 441 | #endif |
445 | if ( sysmap ) | ||
446 | for (addr = (unsigned long)sysmap; | ||
447 | addr < PAGE_ALIGN((unsigned long)sysmap+sysmap_size) ; | ||
448 | addr += PAGE_SIZE) | ||
449 | SetPageReserved(virt_to_page(addr)); | ||
450 | |||
451 | for (addr = PAGE_OFFSET; addr < (unsigned long)high_memory; | 442 | for (addr = PAGE_OFFSET; addr < (unsigned long)high_memory; |
452 | addr += PAGE_SIZE) { | 443 | addr += PAGE_SIZE) { |
453 | if (!PageReserved(virt_to_page(addr))) | 444 | if (!PageReserved(virt_to_page(addr))) |
@@ -469,7 +460,6 @@ void __init mem_init(void) | |||
469 | struct page *page = mem_map + pfn; | 460 | struct page *page = mem_map + pfn; |
470 | 461 | ||
471 | ClearPageReserved(page); | 462 | ClearPageReserved(page); |
472 | set_bit(PG_highmem, &page->flags); | ||
473 | set_page_count(page, 1); | 463 | set_page_count(page, 1); |
474 | __free_page(page); | 464 | __free_page(page); |
475 | totalhigh_pages++; | 465 | totalhigh_pages++; |
@@ -483,9 +473,7 @@ void __init mem_init(void) | |||
483 | codepages<< (PAGE_SHIFT-10), datapages<< (PAGE_SHIFT-10), | 473 | codepages<< (PAGE_SHIFT-10), datapages<< (PAGE_SHIFT-10), |
484 | initpages<< (PAGE_SHIFT-10), | 474 | initpages<< (PAGE_SHIFT-10), |
485 | (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10))); | 475 | (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10))); |
486 | if (sysmap) | 476 | |
487 | printk("System.map loaded at 0x%08x for debugger, size: %ld bytes\n", | ||
488 | (unsigned int)sysmap, sysmap_size); | ||
489 | #ifdef CONFIG_PPC_PMAC | 477 | #ifdef CONFIG_PPC_PMAC |
490 | if (agp_special_page) | 478 | if (agp_special_page) |
491 | printk(KERN_INFO "AGP special page: 0x%08lx\n", agp_special_page); | 479 | printk(KERN_INFO "AGP special page: 0x%08lx\n", agp_special_page); |
@@ -535,9 +523,6 @@ set_phys_avail(unsigned long total_memory) | |||
535 | if (rtas_data) | 523 | if (rtas_data) |
536 | mem_pieces_remove(&phys_avail, rtas_data, rtas_size, 1); | 524 | mem_pieces_remove(&phys_avail, rtas_data, rtas_size, 1); |
537 | #endif | 525 | #endif |
538 | /* remove the sysmap pages from the available memory */ | ||
539 | if (sysmap) | ||
540 | mem_pieces_remove(&phys_avail, __pa(sysmap), sysmap_size, 1); | ||
541 | #ifdef CONFIG_PPC_PMAC | 526 | #ifdef CONFIG_PPC_PMAC |
542 | /* Because of some uninorth weirdness, we need a page of | 527 | /* Because of some uninorth weirdness, we need a page of |
543 | * memory as high as possible (it must be outside of the | 528 | * memory as high as possible (it must be outside of the |