git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
mm
/
highmem.c
diff --git
a/mm/highmem.c
b/mm/highmem.c
index
821d4cd
..
a02c6de
100644
(file)
--- a/
mm/highmem.c
+++ b/
mm/highmem.c
@@
-326,8
+326,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;
- dec_zone_page_state(bvec->bv_page, NR_BOUNCE);
-
mempool_free(bvec->bv_page, pool
);
+ mempool_free(bvec->bv_page, pool);
+
dec_page_state(nr_bounce
);
}
bio_endio(bio_orig, bio_orig->bi_size, err);
}
bio_endio(bio_orig, bio_orig->bi_size, err);
@@
-408,7
+408,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_
zone_page_state(to->bv_page, NR_BOUNCE
);
+ inc_
page_state(nr_bounce
);
if (rw == WRITE) {
char *vto, *vfrom;
if (rw == WRITE) {
char *vto, *vfrom;