git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
ring-buffer/for-next
Head SHA1: 7f4decf8f94431afb7e613ac05e927d3592afe37
Steven Rostedt (1):
ring-buffer: Have parameter to virt_addr_valid() cast to pointer
----
kernel/trace/ring_buffer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---------------------------
commit 7f4decf8f94431afb7e613ac05e927d3592afe37
Author: Steven Rostedt <rostedt@goodmis.org>
Date: Sat Mar 8 12:36:49 2025 -0500
ring-buffer: Have parameter to virt_addr_valid() cast to pointer
Some architectures expect the parameter passed to virt_addr_valid() to be
a pointer. Cast the unsigned long parameter to a void pointer.
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Link: https://lore.kernel.org/20250308123649.1330e9ca@batman.local.home
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202503090029.zj0DretW-lkp@intel.com/
Fixes: 10a299da2c2b9 ("ring-buffer: Allow persistent ring buffers to be mmapped")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 649724efd1be..94be81edffd2 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -7134,7 +7134,7 @@ static int __rb_map_vma(struct ring_buffer_per_cpu *cpu_buffer,
goto out;
}
- if (virt_addr_valid(cpu_buffer->subbuf_ids[s]))
+ if (virt_addr_valid((void *)cpu_buffer->subbuf_ids[s]))
page = virt_to_page((void *)cpu_buffer->subbuf_ids[s]);
else
page = vmalloc_to_page((void *)cpu_buffer->subbuf_ids[s]);