Skip to content

Commit 2352923

Browse files
committed
Merge branch 'for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu
Pull percpu updates from Dennis Zhou: "This has a change to fix percpu-refcount for RT kernels because rcu-sched disables preemption and the refcount release callback might acquire a spinlock" * 'for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu: Revert "percpu: add __percpu to SHIFT_PERCPU_PTR" percpu-refcount: Use normal instead of RCU-sched" percpu: add __percpu to SHIFT_PERCPU_PTR
2 parents 76bb8b0 + ba30e27 commit 2352923

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

include/linux/percpu-refcount.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -186,14 +186,14 @@ static inline void percpu_ref_get_many(struct percpu_ref *ref, unsigned long nr)
186186
{
187187
unsigned long __percpu *percpu_count;
188188

189-
rcu_read_lock_sched();
189+
rcu_read_lock();
190190

191191
if (__ref_is_percpu(ref, &percpu_count))
192192
this_cpu_add(*percpu_count, nr);
193193
else
194194
atomic_long_add(nr, &ref->count);
195195

196-
rcu_read_unlock_sched();
196+
rcu_read_unlock();
197197
}
198198

199199
/**
@@ -223,7 +223,7 @@ static inline bool percpu_ref_tryget(struct percpu_ref *ref)
223223
unsigned long __percpu *percpu_count;
224224
bool ret;
225225

226-
rcu_read_lock_sched();
226+
rcu_read_lock();
227227

228228
if (__ref_is_percpu(ref, &percpu_count)) {
229229
this_cpu_inc(*percpu_count);
@@ -232,7 +232,7 @@ static inline bool percpu_ref_tryget(struct percpu_ref *ref)
232232
ret = atomic_long_inc_not_zero(&ref->count);
233233
}
234234

235-
rcu_read_unlock_sched();
235+
rcu_read_unlock();
236236

237237
return ret;
238238
}
@@ -257,7 +257,7 @@ static inline bool percpu_ref_tryget_live(struct percpu_ref *ref)
257257
unsigned long __percpu *percpu_count;
258258
bool ret = false;
259259

260-
rcu_read_lock_sched();
260+
rcu_read_lock();
261261

262262
if (__ref_is_percpu(ref, &percpu_count)) {
263263
this_cpu_inc(*percpu_count);
@@ -266,7 +266,7 @@ static inline bool percpu_ref_tryget_live(struct percpu_ref *ref)
266266
ret = atomic_long_inc_not_zero(&ref->count);
267267
}
268268

269-
rcu_read_unlock_sched();
269+
rcu_read_unlock();
270270

271271
return ret;
272272
}
@@ -285,14 +285,14 @@ static inline void percpu_ref_put_many(struct percpu_ref *ref, unsigned long nr)
285285
{
286286
unsigned long __percpu *percpu_count;
287287

288-
rcu_read_lock_sched();
288+
rcu_read_lock();
289289

290290
if (__ref_is_percpu(ref, &percpu_count))
291291
this_cpu_sub(*percpu_count, nr);
292292
else if (unlikely(atomic_long_sub_and_test(nr, &ref->count)))
293293
ref->release(ref);
294294

295-
rcu_read_unlock_sched();
295+
rcu_read_unlock();
296296
}
297297

298298
/**

0 commit comments

Comments
 (0)