diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
| commit | 325a479c4c110db278ef3361460a48c4093252cc (patch) | |
| tree | bcfbf4d0647d9442045639a5c19da59d55190e81 /mm/highmem.c | |
| parent | ebcc80c1b6629a445f7471cc1ddb48faf8a84e70 (diff) | |
| parent | 7f9eaedf894dbaa08c157832e9a6c9c03ffed1ed (diff) | |
Merge with temp tree to get David's gdb inferior calls patch
Diffstat (limited to 'mm/highmem.c')
| -rw-r--r-- | mm/highmem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/highmem.c b/mm/highmem.c index d01276506b00..400911599468 100644 --- a/mm/highmem.c +++ b/mm/highmem.c | |||
| @@ -325,6 +325,7 @@ static void bounce_end_io(struct bio *bio, mempool_t *pool, int err) | |||
| 325 | continue; | 325 | continue; |
| 326 | 326 | ||
| 327 | mempool_free(bvec->bv_page, pool); | 327 | mempool_free(bvec->bv_page, pool); |
| 328 | dec_page_state(nr_bounce); | ||
| 328 | } | 329 | } |
| 329 | 330 | ||
| 330 | bio_endio(bio_orig, bio_orig->bi_size, err); | 331 | bio_endio(bio_orig, bio_orig->bi_size, err); |
| @@ -405,6 +406,7 @@ static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig, | |||
| 405 | to->bv_page = mempool_alloc(pool, q->bounce_gfp); | 406 | to->bv_page = mempool_alloc(pool, q->bounce_gfp); |
| 406 | to->bv_len = from->bv_len; | 407 | to->bv_len = from->bv_len; |
| 407 | to->bv_offset = from->bv_offset; | 408 | to->bv_offset = from->bv_offset; |
| 409 | inc_page_state(nr_bounce); | ||
| 408 | 410 | ||
| 409 | if (rw == WRITE) { | 411 | if (rw == WRITE) { |
| 410 | char *vto, *vfrom; | 412 | char *vto, *vfrom; |