projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-4.9/block-smp' of git://git.kernel.dk/linux-block
[cascardo/linux.git]
/
include
/
linux
/
blk-mq.h
diff --git
a/include/linux/blk-mq.h
b/include/linux/blk-mq.h
index
ef6aebf
..
535ab2e
100644
(file)
--- 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_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;
struct blk_mq_hw_ctx {
struct {
spinlock_t lock;
@@
-53,7
+47,7
@@
struct blk_mq_hw_ctx {
struct delayed_work delay_work;
struct delayed_work delay_work;
- struct
blk_mq_cpu_notifier cpu_notifier
;
+ struct
hlist_node cpuhp_dead
;
struct kobject kobj;
unsigned long poll_considered;
struct kobject kobj;
unsigned long poll_considered;