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 'compat' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[cascardo/linux.git]
/
block
/
blk-mq-cpu.c
diff --git
a/block/blk-mq-cpu.c
b/block/blk-mq-cpu.c
index
3146bef
..
136ef86
100644
(file)
--- a/
block/blk-mq-cpu.c
+++ b/
block/blk-mq-cpu.c
@@
-11,7
+11,7
@@
#include "blk-mq.h"
static LIST_HEAD(blk_mq_cpu_notify_list);
#include "blk-mq.h"
static LIST_HEAD(blk_mq_cpu_notify_list);
-static DEFINE_SPINLOCK(blk_mq_cpu_notify_lock);
+static DEFINE_
RAW_
SPINLOCK(blk_mq_cpu_notify_lock);
static int blk_mq_main_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
static int blk_mq_main_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
@@
-19,12
+19,12
@@
static int blk_mq_main_cpu_notify(struct notifier_block *self,
unsigned int cpu = (unsigned long) hcpu;
struct blk_mq_cpu_notifier *notify;
unsigned int cpu = (unsigned long) hcpu;
struct blk_mq_cpu_notifier *notify;
- spin_lock(&blk_mq_cpu_notify_lock);
+
raw_
spin_lock(&blk_mq_cpu_notify_lock);
list_for_each_entry(notify, &blk_mq_cpu_notify_list, list)
notify->notify(notify->data, action, cpu);
list_for_each_entry(notify, &blk_mq_cpu_notify_list, list)
notify->notify(notify->data, action, cpu);
- spin_unlock(&blk_mq_cpu_notify_lock);
+
raw_
spin_unlock(&blk_mq_cpu_notify_lock);
return NOTIFY_OK;
}
return NOTIFY_OK;
}
@@
-32,16
+32,16
@@
void blk_mq_register_cpu_notifier(struct blk_mq_cpu_notifier *notifier)
{
BUG_ON(!notifier->notify);
{
BUG_ON(!notifier->notify);
- spin_lock(&blk_mq_cpu_notify_lock);
+
raw_
spin_lock(&blk_mq_cpu_notify_lock);
list_add_tail(¬ifier->list, &blk_mq_cpu_notify_list);
list_add_tail(¬ifier->list, &blk_mq_cpu_notify_list);
- spin_unlock(&blk_mq_cpu_notify_lock);
+
raw_
spin_unlock(&blk_mq_cpu_notify_lock);
}
void blk_mq_unregister_cpu_notifier(struct blk_mq_cpu_notifier *notifier)
{
}
void blk_mq_unregister_cpu_notifier(struct blk_mq_cpu_notifier *notifier)
{
- spin_lock(&blk_mq_cpu_notify_lock);
+
raw_
spin_lock(&blk_mq_cpu_notify_lock);
list_del(¬ifier->list);
list_del(¬ifier->list);
- spin_unlock(&blk_mq_cpu_notify_lock);
+
raw_
spin_unlock(&blk_mq_cpu_notify_lock);
}
void blk_mq_init_cpu_notifier(struct blk_mq_cpu_notifier *notifier,
}
void blk_mq_init_cpu_notifier(struct blk_mq_cpu_notifier *notifier,