diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
| commit | 57445428488a2862840c4d7c96d7746c11031aaf (patch) | |
| tree | 60b88b3a21896a33ee4dccc727d88b745a9ff731 /mm/highmem.c | |
| parent | 2e837819b1563679b55363d469239fdf4f17fbbb (diff) | |
Merge with Linu 2.4.0-test6-pre6.
Diffstat (limited to 'mm/highmem.c')
| -rw-r--r-- | mm/highmem.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mm/highmem.c b/mm/highmem.c index e11b5d0b1..411f20c52 100644 --- a/mm/highmem.c +++ b/mm/highmem.c @@ -83,7 +83,7 @@ struct page * replace_with_highmem(struct page * page) } vaddr = kmap(highpage); - copy_page((void *)vaddr, (void *)page_address(page)); + copy_page((void *)vaddr, page_address(page)); kunmap(highpage); if (page->mapping) @@ -137,7 +137,7 @@ static void flush_all_zero_pkmaps(void) BUG(); pte_clear(pkmap_page_table+i); page = pte_page(pte); - page->virtual = 0; + page->virtual = NULL; } flush_tlb_all(); } @@ -176,17 +176,17 @@ start: /* Somebody else might have mapped it while we slept */ if (page->virtual) - return page->virtual; + return (unsigned long) page->virtual; /* Re-start */ goto start; } } vaddr = PKMAP_ADDR(last_pkmap_nr); - set_pte(pkmap_page_table + last_pkmap_nr, mk_pte(page, kmap_prot)); + set_pte(&(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot)); pkmap_count[last_pkmap_nr] = 1; - page->virtual = vaddr; + page->virtual = (void *) vaddr; return vaddr; } @@ -202,7 +202,7 @@ unsigned long kmap_high(struct page *page) * We cannot call this from interrupts, as it may block */ spin_lock(&kmap_lock); - vaddr = page->virtual; + vaddr = (unsigned long) page->virtual; if (!vaddr) vaddr = map_new_virtual(page); pkmap_count[PKMAP_NR(vaddr)]++; @@ -218,7 +218,7 @@ void kunmap_high(struct page *page) unsigned long nr; spin_lock(&kmap_lock); - vaddr = page->virtual; + vaddr = (unsigned long) page->virtual; if (!vaddr) BUG(); nr = PKMAP_NR(vaddr); |