Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[karo-tx-linux.git] / include / linux / percpu-refcount.h

diff --git a/include/linux/percpu-refcount.h b/include/linux/percpu-refcount.h
index dba35c411e8c06ab9b3cd5732d3258e4339b55c0..5d8920e23073d8caff4ebe834eaab219e53dba0f 100644 (file)
--- a/include/linux/percpu-refcount.h
+++ b/include/linux/percpu-refcount.h
@@ -110,7 +110,7 @@ static inline void percpu_ref_get(struct percpu_ref *ref)
        pcpu_count = ACCESS_ONCE(ref->pcpu_count);
 
        if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR))
-               __this_cpu_inc(*pcpu_count);
+               this_cpu_inc(*pcpu_count);
        else
                atomic_inc(&ref->count);
 
@@ -136,7 +136,7 @@ static inline bool percpu_ref_tryget(struct percpu_ref *ref)
        pcpu_count = ACCESS_ONCE(ref->pcpu_count);
 
        if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR)) {
-               __this_cpu_inc(*pcpu_count);
+               this_cpu_inc(*pcpu_count);
                ret = true;
        } else {
                ret = atomic_inc_not_zero(&ref->count);
@@ -171,7 +171,7 @@ static inline bool percpu_ref_tryget_live(struct percpu_ref *ref)
        pcpu_count = ACCESS_ONCE(ref->pcpu_count);
 
        if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR)) {
-               __this_cpu_inc(*pcpu_count);
+               this_cpu_inc(*pcpu_count);
                ret = true;
        }
 
@@ -196,7 +196,7 @@ static inline void percpu_ref_put(struct percpu_ref *ref)
        pcpu_count = ACCESS_ONCE(ref->pcpu_count);
 
        if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR))
-               __this_cpu_dec(*pcpu_count);
+               this_cpu_dec(*pcpu_count);
        else if (unlikely(atomic_dec_and_test(&ref->count)))
                ref->release(ref);