diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-01 14:54:10 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-01 14:54:10 +1000 |
| commit | 73177735a2499d48ebf5485a5a1dd60611a5ba00 (patch) | |
| tree | 392b556f026a92bd2417cc2c48cc3abdfc1a42ed /mm | |
| parent | 4b7a256143d5bbb89a4db6b9a42ac7b788075bb1 (diff) | |
| parent | cdecdd3d6a89562401e54bd52085e2bcecb2587f (diff) | |
Merge remote-tracking branch 'block/for-next'
Conflicts:
arch/um/include/asm/Kbuild
drivers/md/dm.c
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/page_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_io.c b/mm/page_io.c index 6424869e275e..520baa4b04d7 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -69,7 +69,7 @@ void end_swap_bio_write(struct bio *bio, int err) bio_put(bio); } -void end_swap_bio_read(struct bio *bio, int err) +static void end_swap_bio_read(struct bio *bio, int err) { const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); struct page *page = bio->bi_io_vec[0].bv_page; |