summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKonstantin Khlebnikov <khlebnikov@openvz.org>2012-02-19 18:29:11 +0400
committerTejun Heo <tj@kernel.org>2012-02-21 08:57:10 -0800
commit7d96b3e55ad45ebe4ff1a1daad27ac1fff8682ec (patch)
tree704d01704e819cfd675610f6f0fdd8bb8a0576e1 /include
parent26dd8e0291fd699142722632c6588a438d6ef0e4 (diff)
downloadlinux-3.10-7d96b3e55ad45ebe4ff1a1daad27ac1fff8682ec.tar.gz
linux-3.10-7d96b3e55ad45ebe4ff1a1daad27ac1fff8682ec.tar.bz2
linux-3.10-7d96b3e55ad45ebe4ff1a1daad27ac1fff8682ec.zip
percpu: fix generic definition of __this_cpu_add_and_return()
This patch adds missed "__" into function prefix. Otherwise on all archectures (except x86) it expands to irq/preemtion-safe variant: _this_cpu_generic_add_return(), which do extra irq-save/irq-restore. Optimal generic implementation is __this_cpu_generic_add_return(). Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org> Acked-by: Christoph Lameter <cl@linux.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/percpu.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index 32cd1f67462..3b609eb9cd7 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -718,7 +718,8 @@ do { \
# ifndef __this_cpu_add_return_8
# define __this_cpu_add_return_8(pcp, val) __this_cpu_generic_add_return(pcp, val)
# endif
-# define __this_cpu_add_return(pcp, val) __pcpu_size_call_return2(this_cpu_add_return_, pcp, val)
+# define __this_cpu_add_return(pcp, val) \
+ __pcpu_size_call_return2(__this_cpu_add_return_, pcp, val)
#endif
#define __this_cpu_sub_return(pcp, val) this_cpu_add_return(pcp, -(val))