X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mm%2Fhighmem.c;h=9b2a5403c447a7bd0f147700a0db48df5b0b58f4;hb=e5beac371af0af47bcbd6819f4c2a0a2721a1735;hp=9b274fdf9d08d66c3ec78ae396284a6a0c70ac61;hpb=3145012c1c34a3504a2234bd2034ca6ea4767bc5;p=powerpc.git

diff --git a/mm/highmem.c b/mm/highmem.c
index 9b274fdf9d..9b2a5403c4 100644
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -315,8 +315,8 @@ static void bounce_end_io(struct bio *bio, mempool_t *pool, int err)
 		if (bvec->bv_page == org_vec->bv_page)
 			continue;
 
-		mempool_free(bvec->bv_page, pool);	
-		dec_page_state(nr_bounce);
+		dec_zone_page_state(bvec->bv_page, NR_BOUNCE);
+		mempool_free(bvec->bv_page, pool);
 	}
 
 	bio_endio(bio_orig, bio_orig->bi_size, err);
@@ -397,7 +397,7 @@ static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig,
 		to->bv_page = mempool_alloc(pool, q->bounce_gfp);
 		to->bv_len = from->bv_len;
 		to->bv_offset = from->bv_offset;
-		inc_page_state(nr_bounce);
+		inc_zone_page_state(to->bv_page, NR_BOUNCE);
 
 		if (rw == WRITE) {
 			char *vto, *vfrom;