diff options
author | Petr Mladek | 2019-05-06 10:33:10 +0200 |
---|---|---|
committer | Petr Mladek | 2019-05-06 10:33:10 +0200 |
commit | 0f46c78391e1348fe45af86a0cd52795726695af (patch) | |
tree | ee841bfa1178ce5be421c79bed73bb5e72b6d38e /mm/vmscan.c | |
parent | Merge branch 'for-5.2-vsprintf-hardening' into for-linus (diff) | |
parent | treewide: Switch printk users from %pf and %pF to %ps and %pS, respectively (diff) | |
download | kernel-qcow2-linux-0f46c78391e1348fe45af86a0cd52795726695af.tar.gz kernel-qcow2-linux-0f46c78391e1348fe45af86a0cd52795726695af.tar.xz kernel-qcow2-linux-0f46c78391e1348fe45af86a0cd52795726695af.zip |
Merge branch 'for-5.2-pf-removal' into for-linus
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r-- | mm/vmscan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index a5ad0b35ab8e..90648187f622 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -493,7 +493,7 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, total_scan += delta; if (total_scan < 0) { - pr_err("shrink_slab: %pF negative objects to delete nr=%ld\n", + pr_err("shrink_slab: %pS negative objects to delete nr=%ld\n", shrinker->scan_objects, total_scan); total_scan = freeable; next_deferred = nr; |