diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 4 | ||||
| -rw-r--r-- | lib/percpu_ida.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/Makefile b/lib/Makefile index b46065fd67a4..a459c31e8c6b 100644 --- a/lib/Makefile +++ b/lib/Makefile | |||
| @@ -13,7 +13,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \ | |||
| 13 | sha1.o md5.o irq_regs.o reciprocal_div.o argv_split.o \ | 13 | sha1.o md5.o irq_regs.o reciprocal_div.o argv_split.o \ |
| 14 | proportions.o flex_proportions.o prio_heap.o ratelimit.o show_mem.o \ | 14 | proportions.o flex_proportions.o prio_heap.o ratelimit.o show_mem.o \ |
| 15 | is_single_threaded.o plist.o decompress.o kobject_uevent.o \ | 15 | is_single_threaded.o plist.o decompress.o kobject_uevent.o \ |
| 16 | earlycpio.o percpu-refcount.o percpu_ida.o | 16 | earlycpio.o |
| 17 | 17 | ||
| 18 | obj-$(CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS) += usercopy.o | 18 | obj-$(CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS) += usercopy.o |
| 19 | lib-$(CONFIG_MMU) += ioremap.o | 19 | lib-$(CONFIG_MMU) += ioremap.o |
| @@ -26,7 +26,7 @@ obj-y += bcd.o div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \ | |||
| 26 | bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o \ | 26 | bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o \ |
| 27 | gcd.o lcm.o list_sort.o uuid.o flex_array.o iovec.o clz_ctz.o \ | 27 | gcd.o lcm.o list_sort.o uuid.o flex_array.o iovec.o clz_ctz.o \ |
| 28 | bsearch.o find_last_bit.o find_next_bit.o llist.o memweight.o kfifo.o \ | 28 | bsearch.o find_last_bit.o find_next_bit.o llist.o memweight.o kfifo.o \ |
| 29 | percpu_ida.o | 29 | percpu-refcount.o percpu_ida.o |
| 30 | obj-y += string_helpers.o | 30 | obj-y += string_helpers.o |
| 31 | obj-$(CONFIG_TEST_STRING_HELPERS) += test-string_helpers.o | 31 | obj-$(CONFIG_TEST_STRING_HELPERS) += test-string_helpers.o |
| 32 | obj-y += kstrtox.o | 32 | obj-y += kstrtox.o |
diff --git a/lib/percpu_ida.c b/lib/percpu_ida.c index b0698ea972c6..9d054bf91d0f 100644 --- a/lib/percpu_ida.c +++ b/lib/percpu_ida.c | |||
| @@ -117,8 +117,7 @@ static inline void alloc_global_tags(struct percpu_ida *pool, | |||
| 117 | min(pool->nr_free, pool->percpu_batch_size)); | 117 | min(pool->nr_free, pool->percpu_batch_size)); |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | static inline unsigned alloc_local_tag(struct percpu_ida *pool, | 120 | static inline unsigned alloc_local_tag(struct percpu_ida_cpu *tags) |
| 121 | struct percpu_ida_cpu *tags) | ||
| 122 | { | 121 | { |
| 123 | int tag = -ENOSPC; | 122 | int tag = -ENOSPC; |
| 124 | 123 | ||
| @@ -159,7 +158,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, gfp_t gfp) | |||
| 159 | tags = this_cpu_ptr(pool->tag_cpu); | 158 | tags = this_cpu_ptr(pool->tag_cpu); |
| 160 | 159 | ||
| 161 | /* Fastpath */ | 160 | /* Fastpath */ |
| 162 | tag = alloc_local_tag(pool, tags); | 161 | tag = alloc_local_tag(tags); |
| 163 | if (likely(tag >= 0)) { | 162 | if (likely(tag >= 0)) { |
| 164 | local_irq_restore(flags); | 163 | local_irq_restore(flags); |
| 165 | return tag; | 164 | return tag; |
