diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-14 12:14:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-14 12:14:12 +0200 |
| commit | 397f09977ea350a20f20b415a9313cc790137742 (patch) | |
| tree | 0e44f2f3e5804bd5c0c6f644785006b7225e3c94 /drivers/s390/block/dasd.c | |
| parent | Merge tag 'please-pull-mce-f-bit' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | amd64_edac: Get rid of boot_cpu_data accesses (diff) | |
| download | linux-397f09977ea350a20f20b415a9313cc790137742.tar.xz linux-397f09977ea350a20f20b415a9313cc790137742.zip | |
Merge tag 'amd_f15_m30' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/ras
Pull AMD F15h, model 0x30 and later enablement stuff, more specifically EDAC
support, from Borislav Petkov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/s390/block/dasd.c')
| -rw-r--r-- | drivers/s390/block/dasd.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 17150a778984..451bf99582ff 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c @@ -2392,6 +2392,12 @@ int dasd_sleep_on_immediatly(struct dasd_ccw_req *cqr) rc = cqr->intrc; else rc = -EIO; + + /* kick tasklets */ + dasd_schedule_device_bh(device); + if (device->block) + dasd_schedule_block_bh(device->block); + return rc; } |