diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-09 17:32:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-09 17:32:20 -0700 |
| commit | 24532f768121b07b16178ffb40442ece43365cbd (patch) | |
| tree | ca2eaf2c3ed031dd3aa977af95df77bfa2e18cc6 /block/blk-mq.h | |
| parent | 12e3d3cdd975fe986cc5c35f60b1467a8ec20b80 (diff) | |
| parent | 97a32864e6de5944c6356049f60569de01e9ba1f (diff) | |
| download | linux-24532f768121b07b16178ffb40442ece43365cbd.tar.gz linux-24532f768121b07b16178ffb40442ece43365cbd.tar.bz2 linux-24532f768121b07b16178ffb40442ece43365cbd.zip | |
Merge branch 'for-4.9/block-smp' of git://git.kernel.dk/linux-block
Pull blk-mq CPU hotplug update from Jens Axboe:
"This is the conversion of blk-mq to the new hotplug state machine"
* 'for-4.9/block-smp' of git://git.kernel.dk/linux-block:
blk-mq: fixup "Convert to new hotplug state machine"
blk-mq: Convert to new hotplug state machine
blk-mq/cpu-notif: Convert to new hotplug state machine
Diffstat (limited to 'block/blk-mq.h')
| -rw-r--r-- | block/blk-mq.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/block/blk-mq.h b/block/blk-mq.h index df6474cb5a4c..e5d25249028c 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -32,13 +32,6 @@ void blk_mq_wake_waiters(struct request_queue *q); /* * CPU hotplug helpers */ -struct blk_mq_cpu_notifier; -void blk_mq_init_cpu_notifier(struct blk_mq_cpu_notifier *notifier, - int (*fn)(void *, unsigned long, unsigned int), - void *data); -void blk_mq_register_cpu_notifier(struct blk_mq_cpu_notifier *notifier); -void blk_mq_unregister_cpu_notifier(struct blk_mq_cpu_notifier *notifier); -void blk_mq_cpu_init(void); void blk_mq_enable_hotplug(void); void blk_mq_disable_hotplug(void); |