diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 18:02:00 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 18:02:00 +0000 |
commit | 02f8110d6a247d53b489b29eec8a35c85e713c6b (patch) | |
tree | 9cb65032a35c2d1af581deaac73dfa2540b2fbdd /mm/highmem.c | |
parent | b62a3d8e8a9d02ff6f9103358b7a9c2c3d56c653 (diff) |
Merge with Linux 2.4.0-test6-pre2.
Diffstat (limited to 'mm/highmem.c')
-rw-r--r-- | mm/highmem.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/highmem.c b/mm/highmem.c index 91b45ae5a..834968569 100644 --- a/mm/highmem.c +++ b/mm/highmem.c @@ -86,9 +86,8 @@ struct page * replace_with_highmem(struct page * page) copy_page((void *)vaddr, (void *)page_address(page)); kunmap(highpage); - /* Preserve the caching of the swap_entry. */ - highpage->index = page->index; - highpage->mapping = page->mapping; + if (page->mapping) + BUG(); /* * We can just forget the old page since |