summaryrefslogtreecommitdiffstats
path: root/mm/vmscan.c
diff options
context:
space:
mode:
authorPetr Mladek2019-05-06 10:33:10 +0200
committerPetr Mladek2019-05-06 10:33:10 +0200
commit0f46c78391e1348fe45af86a0cd52795726695af (patch)
treeee841bfa1178ce5be421c79bed73bb5e72b6d38e /mm/vmscan.c
parentMerge branch 'for-5.2-vsprintf-hardening' into for-linus (diff)
parenttreewide: Switch printk users from %pf and %pF to %ps and %pS, respectively (diff)
downloadkernel-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.c2
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;