projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'backlight-for-linus-3.18' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
lib
/
percpu_counter.c
diff --git
a/lib/percpu_counter.c
b/lib/percpu_counter.c
index 7dd33577b9058ea1569eda068ea437079f5bc65e..48144cdae819017e8a9c0a89aae976359d87121b 100644
(file)
--- a/
lib/percpu_counter.c
+++ b/
lib/percpu_counter.c
@@
-112,13
+112,15
@@
s64 __percpu_counter_sum(struct percpu_counter *fbc)
}
EXPORT_SYMBOL(__percpu_counter_sum);
}
EXPORT_SYMBOL(__percpu_counter_sum);
-int __percpu_counter_init(struct percpu_counter *fbc, s64 amount,
+int __percpu_counter_init(struct percpu_counter *fbc, s64 amount,
gfp_t gfp,
struct lock_class_key *key)
{
struct lock_class_key *key)
{
+ unsigned long flags __maybe_unused;
+
raw_spin_lock_init(&fbc->lock);
lockdep_set_class(&fbc->lock, key);
fbc->count = amount;
raw_spin_lock_init(&fbc->lock);
lockdep_set_class(&fbc->lock, key);
fbc->count = amount;
- fbc->counters = alloc_percpu
(s32
);
+ fbc->counters = alloc_percpu
_gfp(s32, gfp
);
if (!fbc->counters)
return -ENOMEM;
if (!fbc->counters)
return -ENOMEM;
@@
-126,9
+128,9
@@
int __percpu_counter_init(struct percpu_counter *fbc, s64 amount,
#ifdef CONFIG_HOTPLUG_CPU
INIT_LIST_HEAD(&fbc->list);
#ifdef CONFIG_HOTPLUG_CPU
INIT_LIST_HEAD(&fbc->list);
- spin_lock
(&percpu_counters_lock
);
+ spin_lock
_irqsave(&percpu_counters_lock, flags
);
list_add(&fbc->list, &percpu_counters);
list_add(&fbc->list, &percpu_counters);
- spin_unlock
(&percpu_counters_lock
);
+ spin_unlock
_irqrestore(&percpu_counters_lock, flags
);
#endif
return 0;
}
#endif
return 0;
}
@@
-136,15
+138,17
@@
EXPORT_SYMBOL(__percpu_counter_init);
void percpu_counter_destroy(struct percpu_counter *fbc)
{
void percpu_counter_destroy(struct percpu_counter *fbc)
{
+ unsigned long flags __maybe_unused;
+
if (!fbc->counters)
return;
debug_percpu_counter_deactivate(fbc);
#ifdef CONFIG_HOTPLUG_CPU
if (!fbc->counters)
return;
debug_percpu_counter_deactivate(fbc);
#ifdef CONFIG_HOTPLUG_CPU
- spin_lock
(&percpu_counters_lock
);
+ spin_lock
_irqsave(&percpu_counters_lock, flags
);
list_del(&fbc->list);
list_del(&fbc->list);
- spin_unlock
(&percpu_counters_lock
);
+ spin_unlock
_irqrestore(&percpu_counters_lock, flags
);
#endif
free_percpu(fbc->counters);
fbc->counters = NULL;
#endif
free_percpu(fbc->counters);
fbc->counters = NULL;
@@
-173,7
+177,7
@@
static int percpu_counter_hotcpu_callback(struct notifier_block *nb,
return NOTIFY_OK;
cpu = (unsigned long)hcpu;
return NOTIFY_OK;
cpu = (unsigned long)hcpu;
- spin_lock(&percpu_counters_lock);
+ spin_lock
_irq
(&percpu_counters_lock);
list_for_each_entry(fbc, &percpu_counters, list) {
s32 *pcount;
unsigned long flags;
list_for_each_entry(fbc, &percpu_counters, list) {
s32 *pcount;
unsigned long flags;
@@
-184,7
+188,7
@@
static int percpu_counter_hotcpu_callback(struct notifier_block *nb,
*pcount = 0;
raw_spin_unlock_irqrestore(&fbc->lock, flags);
}
*pcount = 0;
raw_spin_unlock_irqrestore(&fbc->lock, flags);
}
- spin_unlock(&percpu_counters_lock);
+ spin_unlock
_irq
(&percpu_counters_lock);
#endif
return NOTIFY_OK;
}
#endif
return NOTIFY_OK;
}