mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'for-5.2-pf-removal' into for-linus
This commit is contained in:
commit
0f46c78391
56 changed files with 106 additions and 106 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue