diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-09 15:50:15 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-09 15:50:19 +1100 |
| commit | 1e7bf38ec36c9b636b423be1fdb3015dcc9c4c01 (patch) | |
| tree | bd4b853b501bf3559e7945c51ad2f89f721492d5 /include/linux/percpu_counter.h | |
| parent | e47bb4e2c4c63b2676ad9c202a88571028937636 (diff) | |
| parent | 0a15cbdaefcd2d44fa4b2933627012e5f2f250b1 (diff) | |
Merge remote-tracking branch 'percpu/for-next'
Conflicts:
arch/s390/include/asm/cputime.h
arch/s390/kernel/irq.c
arch/s390/kernel/processor.c
arch/s390/kernel/vtime.c
fs/ext4/super.c
kernel/irq_work.c
Diffstat (limited to 'include/linux/percpu_counter.h')
| -rw-r--r-- | include/linux/percpu_counter.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/percpu_counter.h b/include/linux/percpu_counter.h index d5dd4657c8d6..50e50095c8d1 100644 --- a/include/linux/percpu_counter.h +++ b/include/linux/percpu_counter.h @@ -12,6 +12,7 @@ #include <linux/threads.h> #include <linux/percpu.h> #include <linux/types.h> +#include <linux/gfp.h> #ifdef CONFIG_SMP @@ -26,14 +27,14 @@ struct percpu_counter { extern int percpu_counter_batch; -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); -#define percpu_counter_init(fbc, value) \ +#define percpu_counter_init(fbc, value, gfp) \ ({ \ static struct lock_class_key __key; \ \ - __percpu_counter_init(fbc, value, &__key); \ + __percpu_counter_init(fbc, value, gfp, &__key); \ }) void percpu_counter_destroy(struct percpu_counter *fbc); @@ -89,7 +90,8 @@ struct percpu_counter { s64 count; }; -static inline int percpu_counter_init(struct percpu_counter *fbc, s64 amount) +static inline int percpu_counter_init(struct percpu_counter *fbc, s64 amount, + gfp_t gfp) { fbc->count = amount; return 0; |