Merge master.kernel.org:/home/rmk/linux-2.6-arm

[safe/jmp/linux-2.6] / mm / page_io.c

diff --git a/mm/page_io.c b/mm/page_io.c
index afeed89..31a3b96 100644 (file)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -12,6 +12,7 @@
 
 #include <linux/mm.h>
 #include <linux/kernel_stat.h>
+#include <linux/gfp.h>
 #include <linux/pagemap.h>
 #include <linux/swap.h>
 #include <linux/bio.h>
@@ -26,9 +27,7 @@ static struct bio *get_swap_bio(gfp_t gfp_flags,
 
        bio = bio_alloc(gfp_flags, 1);
        if (bio) {
-               swp_entry_t entry;
-               entry.val = page_private(page);
-               bio->bi_sector = map_swap_page(entry, &bio->bi_bdev);
+               bio->bi_sector = map_swap_page(page, &bio->bi_bdev);
                bio->bi_sector <<= PAGE_SHIFT - 9;
                bio->bi_io_vec[0].bv_page = page;
                bio->bi_io_vec[0].bv_len = PAGE_SIZE;