diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-26 09:14:47 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-26 09:14:47 +0300 |
| commit | 9bf9d47a29afbf7a43eae74a988a4aefe88ccbfd (patch) | |
| tree | 966b838e2190a7d6868cda5f4eee6d0f490da27c /fs/bio.c | |
| parent | e45f265e7ea3ee6de24efe91fe2928d603cb1741 (diff) | |
| parent | 138f296e140f79cb955caba70690076fb14e6f6d (diff) | |
Merge branch '3.10/fb-mmap' into for-next
Merge topic branch to get vm_iomap_memory into use.
Conflicts:
drivers/video/fbmon.c
Diffstat (limited to 'fs/bio.c')
| -rw-r--r-- | fs/bio.c | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -1428,8 +1428,6 @@ void bio_endio(struct bio *bio, int error) else if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) error = -EIO; - trace_block_bio_complete(bio, error); - if (bio->bi_end_io) bio->bi_end_io(bio, error); } |