From 9d20fb82e353da40c74de9f745cb1f6991813061 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Sun, 1 May 2005 08:58:37 -0700
Subject: [PATCH] --- yaml --- r: 630 b: refs/heads/master c:
 edfbe2b0038723e5699ab22695ccd62b5542a5c1 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/page-flags.h | 1 +
 trunk/mm/highmem.c               | 2 ++
 trunk/mm/page_alloc.c            | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9d464c3b3731..6a52dd461108 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2054606ad6dd6fee559fe790f190b15ed9355237
+refs/heads/master: edfbe2b0038723e5699ab22695ccd62b5542a5c1
diff --git a/trunk/include/linux/page-flags.h b/trunk/include/linux/page-flags.h
index 6b74fcf5bb63..39ab8c6b5652 100644
--- a/trunk/include/linux/page-flags.h
+++ b/trunk/include/linux/page-flags.h
@@ -131,6 +131,7 @@ struct page_state {
 	unsigned long allocstall;	/* direct reclaim calls */
 
 	unsigned long pgrotated;	/* pages rotated to tail of the LRU */
+	unsigned long nr_bounce;	/* pages for bounce buffers */
 };
 
 extern void get_page_state(struct page_state *ret);
diff --git a/trunk/mm/highmem.c b/trunk/mm/highmem.c
index d01276506b00..400911599468 100644
--- a/trunk/mm/highmem.c
+++ b/trunk/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;
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 04a35b3d3262..80ce7f2104df 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1897,6 +1897,7 @@ static char *vmstat_text[] = {
 	"allocstall",
 
 	"pgrotated",
+	"nr_bounce",
 };
 
 static void *vmstat_start(struct seq_file *m, loff_t *pos)