diff options
| author | Chris Zankel | 2014-02-24 09:34:36 +0100 |
|---|---|---|
| committer | Chris Zankel | 2014-02-24 09:34:36 +0100 |
| commit | b3fdfc1b4b641d372e35ced98814289bc60bc5d1 (patch) | |
| tree | 5f11d5ba885031dde45690745646519fb887f447 /kernel/power/block_io.c | |
| parent | xtensa: fix fast_syscall_spill_registers (diff) | |
| parent | xtensa: wire up sched_setattr and sched_getattr syscalls (diff) | |
| download | kernel-qcow2-linux-b3fdfc1b4b641d372e35ced98814289bc60bc5d1.tar.gz kernel-qcow2-linux-b3fdfc1b4b641d372e35ced98814289bc60bc5d1.tar.xz kernel-qcow2-linux-b3fdfc1b4b641d372e35ced98814289bc60bc5d1.zip | |
Merge tag 'xtensa-for-next-20140221-1' into for_next
Xtensa fixes for 3.14:
- allow booting xtfpga on boards with new uBoot and >128MBytes memory;
- drop nonexistent GPIO32 support from fsf variant;
- don't select USE_GENERIC_SMP_HELPERS;
- enable common clock framework support, set up ethoc clock on xtfpga;
- wire up sched_setattr and sched_getattr syscalls.
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'kernel/power/block_io.c')
| -rw-r--r-- | kernel/power/block_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/block_io.c b/kernel/power/block_io.c index d09dd10c5a5e..9a58bc258810 100644 --- a/kernel/power/block_io.c +++ b/kernel/power/block_io.c @@ -32,7 +32,7 @@ static int submit(int rw, struct block_device *bdev, sector_t sector, struct bio *bio; bio = bio_alloc(__GFP_WAIT | __GFP_HIGH, 1); - bio->bi_sector = sector; + bio->bi_iter.bi_sector = sector; bio->bi_bdev = bdev; bio->bi_end_io = end_swap_bio_read; |