Merge with temp tree to get David's gdb inferior calls patch

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)
                         continue;
 
                 mempool_free(bvec->bv_page, pool);      
+                dec_page_state(nr_bounce);
         }
 
         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,
                 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);
 
                 if (rw == WRITE) {
                         char *vto, *vfrom;