Merge tag 'core-urgent-2020-07-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 5465a324af6a · 2020-07-05T12:21:28.000-07:00
Pull rcu fixlet from Thomas Gleixner:
 "A single fix for a printk format warning in RCU"

* tag 'core-urgent-2020-07-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  rcuperf: Fix printk format warning
diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c
@@ -723,7 +723,7 @@ kfree_perf_init(void)
 		schedule_timeout_uninterruptible(1);
 	}
 
-	pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));
+	pr_alert("kfree object size=%zu\n", kfree_mult * sizeof(struct kfree_obj));
 
 	kfree_reader_tasks = kcalloc(kfree_nrealthreads, sizeof(kfree_reader_tasks[0]),
 			       GFP_KERNEL);

Original file line number	Diff line number	Diff line change
`@@ -723,7 +723,7 @@ kfree_perf_init(void)`
`723`	`723`	`schedule_timeout_uninterruptible(1);`
`724`	`724`	`}`
`725`	`725`
`726`		`- pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));`
	`726`	`+ pr_alert("kfree object size=%zu\n", kfree_mult * sizeof(struct kfree_obj));`
`727`	`727`
`728`	`728`	`kfree_reader_tasks = kcalloc(kfree_nrealthreads, sizeof(kfree_reader_tasks[0]),`
`729`	`729`	`GFP_KERNEL);`