Re: [PATCH v4 4/4] printk: use the lockless ringbuffer

From: John Ogness
Date: Wed Jul 08 2020 - 09:18:25 EST


Fix prepared for for v5.

On 2020-07-08, kernel test robot <lkp@xxxxxxxxx> wrote:
>>> kernel/printk/printk.c:1146:10: warning: format specifies type 'unsigned long' but the argument has type 'size_t' (aka 'unsigned int') [-Wformat]
> new_descs_size);
> ^~~~~~~~~~~~~~
> include/linux/printk.h:338:33: note: expanded from macro 'pr_err'
> printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
> ~~~ ^~~~~~~~~~~
> 1 warning generated.

Reported-by: kernel test robot <lkp@xxxxxxxxx>

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index de8d54be4115..0b1337f4188c 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1142,7 +1142,7 @@ void __init setup_log_buf(int early)
new_descs_size = new_descs_count * sizeof(struct prb_desc);
new_descs = memblock_alloc(new_descs_size, LOG_ALIGN);
if (unlikely(!new_descs)) {
- pr_err("log_buf_len: %lu desc bytes not available\n",
+ pr_err("log_buf_len: %zu desc bytes not available\n",
new_descs_size);
memblock_free(__pa(new_dict_buf), new_log_buf_len);
memblock_free(__pa(new_log_buf), new_log_buf_len);