vserver 1.9.5.x5

[linux-2.6.git] / mm / highmem.c

diff --git a/mm/highmem.c b/mm/highmem.c
index 9fc1106..e4cb0aa 100644 (file)
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -26,7 +26,6 @@
 #include <linux/init.h>
 #include <linux/hash.h>
 #include <linux/highmem.h>
-#include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 
 static mempool_t *page_pool, *isa_page_pool;
@@ -54,7 +53,7 @@ static void page_pool_free(void *page, void *data)
 #ifdef CONFIG_HIGHMEM
 static int pkmap_count[LAST_PKMAP];
 static unsigned int last_pkmap_nr;
-static spinlock_t kmap_lock __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED;
+static  __cacheline_aligned_in_smp DEFINE_SPINLOCK(kmap_lock);
 
 pte_t * pkmap_page_table;
 
@@ -285,7 +284,7 @@ static void copy_to_high_bio_irq(struct bio *to, struct bio *from)
        struct bio_vec *tovec, *fromvec;
        int i;
 
-       bio_for_each_segment(tovec, to, i) {
+       __bio_for_each_segment(tovec, to, i, 0) {
                fromvec = from->bi_io_vec + i;
 
                /*
@@ -301,25 +300,24 @@ static void copy_to_high_bio_irq(struct bio *to, struct bio *from)
                 */
                vfrom = page_address(fromvec->bv_page) + tovec->bv_offset;
 
+               flush_dcache_page(tovec->bv_page);
                bounce_copy_vec(tovec, vfrom);
        }
 }
 
-static void bounce_end_io(struct bio *bio, mempool_t *pool)
+static void bounce_end_io(struct bio *bio, mempool_t *pool, int err)
 {
        struct bio *bio_orig = bio->bi_private;
        struct bio_vec *bvec, *org_vec;
        int i;
 
-       if (!test_bit(BIO_UPTODATE, &bio->bi_flags))
-               goto out_eio;
-
-       set_bit(BIO_UPTODATE, &bio_orig->bi_flags);
+       if (test_bit(BIO_EOPNOTSUPP, &bio->bi_flags))
+               set_bit(BIO_EOPNOTSUPP, &bio_orig->bi_flags);
 
        /*
         * free up bounce indirect pages used
         */
-       bio_for_each_segment(bvec, bio, i) {
+       __bio_for_each_segment(bvec, bio, i, 0) {
                org_vec = bio_orig->bi_io_vec + i;
                if (bvec->bv_page == org_vec->bv_page)
                        continue;
@@ -327,8 +325,7 @@ static void bounce_end_io(struct bio *bio, mempool_t *pool)
                mempool_free(bvec->bv_page, pool);      
        }
 
-out_eio:
-       bio_endio(bio_orig, bio_orig->bi_size, 0);
+       bio_endio(bio_orig, bio_orig->bi_size, err);
        bio_put(bio);
 }
 
@@ -337,7 +334,7 @@ static int bounce_end_io_write(struct bio *bio, unsigned int bytes_done,int err)
        if (bio->bi_size)
                return 1;
 
-       bounce_end_io(bio, page_pool);
+       bounce_end_io(bio, page_pool, err);
        return 0;
 }
 
@@ -346,18 +343,18 @@ static int bounce_end_io_write_isa(struct bio *bio, unsigned int bytes_done, int
        if (bio->bi_size)
                return 1;
 
-       bounce_end_io(bio, isa_page_pool);
+       bounce_end_io(bio, isa_page_pool, err);
        return 0;
 }
 
-static void __bounce_end_io_read(struct bio *bio, mempool_t *pool)
+static void __bounce_end_io_read(struct bio *bio, mempool_t *pool, int err)
 {
        struct bio *bio_orig = bio->bi_private;
 
        if (test_bit(BIO_UPTODATE, &bio->bi_flags))
                copy_to_high_bio_irq(bio_orig, bio);
 
-       bounce_end_io(bio, pool);
+       bounce_end_io(bio, pool, err);
 }
 
 static int bounce_end_io_read(struct bio *bio, unsigned int bytes_done, int err)
@@ -365,7 +362,7 @@ static int bounce_end_io_read(struct bio *bio, unsigned int bytes_done, int err)
        if (bio->bi_size)
                return 1;
 
-       __bounce_end_io_read(bio, page_pool);
+       __bounce_end_io_read(bio, page_pool, err);
        return 0;
 }
 
@@ -374,7 +371,7 @@ static int bounce_end_io_read_isa(struct bio *bio, unsigned int bytes_done, int
        if (bio->bi_size)
                return 1;
 
-       __bounce_end_io_read(bio, isa_page_pool);
+       __bounce_end_io_read(bio, isa_page_pool, err);
        return 0;
 }
 
@@ -410,6 +407,7 @@ static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig,
                if (rw == WRITE) {
                        char *vto, *vfrom;
 
+                       flush_dcache_page(from->bv_page);
                        vto = page_address(to->bv_page) + to->bv_offset;
                        vfrom = kmap(from->bv_page) + from->bv_offset;
                        memcpy(vto, vfrom, to->bv_len);
@@ -427,7 +425,7 @@ static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig,
         * at least one page was bounced, fill in possible non-highmem
         * pages
         */
-       bio_for_each_segment(from, *bio_orig, i) {
+       __bio_for_each_segment(from, *bio_orig, i, 0) {
                to = bio_iovec_idx(bio, i);
                if (!to->bv_page) {
                        to->bv_page = from->bv_page;