perf/hw_breakpoint: Use ERR_PTR_PCPU(), IS_ERR_PCPU() and PTR_ERR_PCPU() macros
PATCH 1/1 perf/hw_breakpoint: Use ERR_PTR_PCPU(), IS_ERR_PCPU() and PTR_ERR_PCPU() macros
Use ERR_PTR_PCPU() when returning error pointer in the percpu address space. Use IS_ERR_PCPU() and PTR_ERR_PCPU() when returning the error pointer from the percpu address space. These macros add intermediate cast to unsigned long when switching named address spaces.
The patch will avoid future build errors due to pointer address space mismatch with enabled strict percpu address space checks.
Signed-off-by Uros Bizjak <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Ian Rogers <[email protected]>
Cc Adrian Hunter <[email protected]>
Cc "Liang, Kan" <[email protected]>
--- kernel/events/hw_breakpoint.c | 4 ++-- samples/hw_breakpoint/data_breakpoint.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
kernel/events/hw_breakpoint.c +2 -2
@@ -849,7 +849,7 @@ register_wide_hw_breakpoint(struct perf_event_attr *attr, cpu_events =alloc_percpu (typeof (*cpu_events));if (!cpu_events) -return (void __percpu __force *)ERR_PTR (-ENOMEM ); +return ERR_PTR_PCPU (-ENOMEM );cpus_read_lock ();for_each_online_cpu (cpu) {
@@ -868,7 +868,7 @@ register_wide_hw_breakpoint(struct perf_event_attr *attr,return cpu_events;unregister_wide_hw_breakpoint (cpu_events); -return (void __percpu __force *)ERR_PTR (err); +return ERR_PTR_PCPU (err); }EXPORT_SYMBOL_GPL (register_wide_hw_breakpoint);
samples/hw_breakpoint/data_breakpoint.c +2 -2
@@ -52,8 +52,8 @@ static int __init hw_break_module_init(void) attr.bp_type =HW_BREAKPOINT_W ; sample_hbp =register_wide_hw_breakpoint (&attr, sample_hbp_handler,NULL ); -if (IS_ERR ((void __force *)sample_hbp)) { - ret =PTR_ERR ((void __force *)sample_hbp); +if (IS_ERR_PCPU (sample_hbp)) { + ret =PTR_ERR_PCPU (sample_hbp); goto fail; }
Signature · 1 line
2.46.1