diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 22:17:26 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 22:17:26 +0000 |
| commit | 984760dbf5e48f6224dfe9e26e03536b3d38b6cd (patch) | |
| tree | a99674322e524c4c90009b3bdae5fab0eebf2094 /arch/ia64 | |
| parent | a7ce7d5e94c98ef5b867f61b2ebecd563f4b6ec9 (diff) | |
Merge with Linux 2.4.0-test6-pre8.
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/ia32/binfmt_elf32.c | 4 | ||||
| -rw-r--r-- | arch/ia64/mm/init.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c index 6c63e33a7..770ef6363 100644 --- a/arch/ia64/ia32/binfmt_elf32.c +++ b/arch/ia64/ia32/binfmt_elf32.c @@ -81,9 +81,9 @@ void ia64_elf32_init(struct pt_regs *regs) { int nr; - put_shared_page(current, mem_map + MAP_NR(ia32_gdt_table), IA32_PAGE_OFFSET); + put_shared_page(current, virt_to_page(ia32_gdt_table), IA32_PAGE_OFFSET); if (PAGE_SHIFT <= IA32_PAGE_SHIFT) - put_shared_page(current, mem_map + MAP_NR(ia32_tss), IA32_PAGE_OFFSET + PAGE_SIZE); + put_shared_page(current, virt_to_page(ia32_tss), IA32_PAGE_OFFSET + PAGE_SIZE); nr = smp_processor_id(); diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index d911c91bf..8ddda7e11 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -173,8 +173,8 @@ free_initmem (void) addr = (unsigned long) &__init_begin; for (; addr < (unsigned long) &__init_end; addr += PAGE_SIZE) { - clear_bit(PG_reserved, &mem_map[MAP_NR(addr)].flags); - set_page_count(&mem_map[MAP_NR(addr)], 1); + clear_bit(PG_reserved, &virt_to_page(addr)->flags); + set_page_count(virt_to_page(addr), 1); free_page(addr); ++totalram_pages; } @@ -188,8 +188,8 @@ free_initrd_mem(unsigned long start, unsigned long end) if (start < end) printk ("Freeing initrd memory: %ldkB freed\n", (end - start) >> 10); for (; start < end; start += PAGE_SIZE) { - clear_bit(PG_reserved, &mem_map[MAP_NR(start)].flags); - set_page_count(&mem_map[MAP_NR(start)], 1); + clear_bit(PG_reserved, &virt_to_page(start)->flags); + set_page_count(virt_to_page(start), 1); free_page(start); ++totalram_pages; } @@ -372,7 +372,7 @@ count_reserved_pages (u64 start, u64 end, void *arg) unsigned long *count = arg; struct page *pg; - for (pg = mem_map + MAP_NR(start); pg < mem_map + MAP_NR(end); ++pg) + for (pg = virt_to_page(start); pg < virt_to_page(end); ++pg) if (PageReserved(pg)) ++num_reserved; *count += num_reserved; @@ -409,7 +409,7 @@ mem_init (void) datasize >> 10, initsize >> 10); /* install the gate page in the global page table: */ - put_gate_page(mem_map + MAP_NR(__start_gate_section), GATE_ADDR); + put_gate_page(virt_to_page(__start_gate_section), GATE_ADDR); #ifndef CONFIG_IA64_SOFTSDV_HACKS /* |