OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.2/core' of git://git.kernel.dk/linux-block
[uclinux-h8/linux.git]
/
block
/
bounce.c
diff --git
a/block/bounce.c
b/block/bounce.c
index
4bac725
..
3ab0bce
100644
(file)
--- a/
block/bounce.c
+++ b/
block/bounce.c
@@
-218,8
+218,8
@@
bounce:
if (page_to_pfn(page) <= queue_bounce_pfn(q) && !force)
continue;
- inc_zone_page_state(to->bv_page, NR_BOUNCE);
to->bv_page = mempool_alloc(pool, q->bounce_gfp);
+ inc_zone_page_state(to->bv_page, NR_BOUNCE);
if (rw == WRITE) {
char *vto, *vfrom;