diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /mm/swapfile.c | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'mm/swapfile.c')
| -rw-r--r-- | mm/swapfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index e8a2a0b2f..abdb08e57 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -207,7 +207,7 @@ swp_entry_t acquire_swap_entry(struct page *page) unsigned long offset, type; swp_entry_t entry; - if (!test_bit(PG_swap_entry, &page->flags)) + if (!PageSwapEntry(page)) goto new_swap_entry; /* We have the old entry in the page offset still */ @@ -538,7 +538,7 @@ int get_swaparea_info(char *buf) len += sprintf(buf, "Filename\t\t\tType\t\tSize\tUsed\tPriority\n"); for (i = 0 ; i < nr_swapfiles ; i++, ptr++) { if (ptr->flags & SWP_USED) { - char * path = d_path(ptr->swap_file, page, PAGE_SIZE); + char * path = d_path(ptr->swap_file, NULL, page, PAGE_SIZE); len += sprintf(buf + len, "%-31s ", path); |