projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[powerpc.git]
/
mm
/
highmem.c
diff --git
a/mm/highmem.c
b/mm/highmem.c
index
9b274fd
..
9b2a540
100644
(file)
--- 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;
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);
}
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;
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;
if (rw == WRITE) {
char *vto, *vfrom;