Merge branch 'for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu

[sfrench/cifs-2.6.git] / lib / percpu-refcount.c

diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
index 9877682e49c784adcdd1bba31837ab971819d8c0..da54318d3b5561a4855faca6ba472f1d5904d863 100644 (file)
--- a/lib/percpu-refcount.c
+++ b/lib/percpu-refcount.c
@@ -151,7 +151,7 @@ static void percpu_ref_switch_to_atomic_rcu(struct rcu_head *rcu)
        atomic_long_add((long)count - PERCPU_COUNT_BIAS, &ref->count);
 
        WARN_ONCE(atomic_long_read(&ref->count) <= 0,
        atomic_long_add((long)count - PERCPU_COUNT_BIAS, &ref->count);
 
        WARN_ONCE(atomic_long_read(&ref->count) <= 0,

-                 "percpu ref (%pf) <= 0 (%ld) after switching to atomic",
+                 "percpu ref (%ps) <= 0 (%ld) after switching to atomic",

                  ref->release, atomic_long_read(&ref->count));
 
        /* @ref is viewed as dead on all CPUs, send out switch confirmation */
                  ref->release, atomic_long_read(&ref->count));
 
        /* @ref is viewed as dead on all CPUs, send out switch confirmation */


@@ -333,7 +333,7 @@ void percpu_ref_kill_and_confirm(struct percpu_ref *ref,
        spin_lock_irqsave(&percpu_ref_switch_lock, flags);
 
        WARN_ONCE(ref->percpu_count_ptr & __PERCPU_REF_DEAD,
        spin_lock_irqsave(&percpu_ref_switch_lock, flags);
 
        WARN_ONCE(ref->percpu_count_ptr & __PERCPU_REF_DEAD,

-                 "%s called more than once on %pf!", __func__, ref->release);
+                 "%s called more than once on %ps!", __func__, ref->release);

 
        ref->percpu_count_ptr |= __PERCPU_REF_DEAD;
        __percpu_ref_switch_mode(ref, confirm_kill);
 
        ref->percpu_count_ptr |= __PERCPU_REF_DEAD;
        __percpu_ref_switch_mode(ref, confirm_kill);