diff options
| author | Petr Mladek <pmladek@suse.com> | 2019-05-06 10:33:10 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2019-05-06 10:33:10 +0200 |
| commit | 0f46c78391e1348fe45af86a0cd52795726695af (patch) | |
| tree | ee841bfa1178ce5be421c79bed73bb5e72b6d38e /lib | |
| parent | 35e1547511fcb035437b4527184458adfb0e8f43 (diff) | |
| parent | d75f773c86a2b8b7278e2c33343b46a4024bc002 (diff) | |
| download | linux-0f46c78391e1348fe45af86a0cd52795726695af.tar.bz2 | |
Merge branch 'for-5.2-pf-removal' into for-linus
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/error-inject.c | 2 | ||||
| -rw-r--r-- | lib/percpu-refcount.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/error-inject.c b/lib/error-inject.c index c0d4600f4896..aa63751c916f 100644 --- a/lib/error-inject.c +++ b/lib/error-inject.c @@ -189,7 +189,7 @@ static int ei_seq_show(struct seq_file *m, void *v) { struct ei_entry *ent = list_entry(v, struct ei_entry, list); - seq_printf(m, "%pf\t%s\n", (void *)ent->start_addr, + seq_printf(m, "%ps\t%s\n", (void *)ent->start_addr, error_type_string(ent->etype)); return 0; } diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c index 9877682e49c7..da54318d3b55 100644 --- 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, - "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 */ @@ -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, - "%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); |