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 /include | |
| parent | 12e3d3cdd975fe986cc5c35f60b1467a8ec20b80 (diff) | |
| parent | 97a32864e6de5944c6356049f60569de01e9ba1f (diff) | |
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 'include')
| -rw-r--r-- | include/linux/blk-mq.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index ef6aebf291ed..535ab2e13d2e 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -7,12 +7,6 @@ struct blk_mq_tags; struct blk_flush_queue; -struct blk_mq_cpu_notifier { - struct list_head list; - void *data; - int (*notify)(void *data, unsigned long action, unsigned int cpu); -}; - struct blk_mq_hw_ctx { struct { spinlock_t lock; @@ -53,7 +47,7 @@ struct blk_mq_hw_ctx { struct delayed_work delay_work; - struct blk_mq_cpu_notifier cpu_notifier; + struct hlist_node cpuhp_dead; struct kobject kobj; unsigned long poll_considered; |