Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit a9511afb2460bc0e3a4fc4b34c78028d1d4e6ea0

Authored by Dan Murphy
2 parents 6548be5013 54539cd217
Exists in ti-linux-3.15.y and in 1 other branch smarc-ti-linux-3.15.y

Merge branch 'master' of http://git.kernel.org/pub/scm/linux/kernel/git/torvalds… 

…/linux into ti-linux-3.15.y

* 'master' of http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux:
  percpu-refcount: fix usage of this_cpu_ops

Signed-off-by: Dan Murphy <DMurphy@ti.com>

Showing 1 changed file Side-by-side Diff

include/linux/percpu-refcount.h
Diff comments   View file @ a9511af
... ... @@ -110,7 +110,7 @@
110 110 pcpu_count = ACCESS_ONCE(ref->pcpu_count);
111 111  
112 112 if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR))
113   - __this_cpu_inc(*pcpu_count);
  113 + this_cpu_inc(*pcpu_count);
114 114 else
115 115 atomic_inc(&ref->count);
116 116  
... ... @@ -139,7 +139,7 @@
139 139 pcpu_count = ACCESS_ONCE(ref->pcpu_count);
140 140  
141 141 if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR)) {
142   - __this_cpu_inc(*pcpu_count);
  142 + this_cpu_inc(*pcpu_count);
143 143 ret = true;
144 144 }
145 145  
... ... @@ -164,7 +164,7 @@
164 164 pcpu_count = ACCESS_ONCE(ref->pcpu_count);
165 165  
166 166 if (likely(REF_STATUS(pcpu_count) == PCPU_REF_PTR))
167   - __this_cpu_dec(*pcpu_count);
  167 + this_cpu_dec(*pcpu_count);
168 168 else if (unlikely(atomic_dec_and_test(&ref->count)))
169 169 ref->release(ref);
170 170