linux-next: tip tree build warning
Hi all,
Today's linux-next build (powerpc allyesconfig) produced this warning:
In file included from kernel/trace/trace.h:14,
from kernel/trace/trace_selftest_dynamic.c:1:include/linux/hw_breakpoint.h: In function 'modify_user_hw_breakpoint':include/linux/hw_breakpoint.h:96: warning: return makes integer from pointer without a cast
Introduced by commit 44234adcdce38f83c56e05f808ce656175b4beeb ("hw-breakpoints: Modify breakpoints without unregistering them") from the tip tree.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 1/1 hw-breakpoints: Handle bad modify_user_hw_breakpoint off-case return value
While converting modify_user_hw_breakpoint() return value, we forgot to handle the off-case. It's not returning a pointer anymore.
--- include/linux/hw_breakpoint.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/hw_breakpoint.h +1 -1
@@ -93,7 +93,7 @@ register_user_hw_breakpoint(struct perf_event_attr *attr, struct task_struct *tsk) { return NULL; }static inline int modify_user_hw_breakpoint (struct perf_event *bp, -struct perf_event_attr *attr) {return NULL ; } +struct perf_event_attr *attr) {return -ENOSYS ; }static inline struct perf_event * register_wide_hw_breakpoint_cpu(struct perf_event_attr *attr, perf_overflow_handler_t triggered,
Signature · 1 line
1.6.2.3
[tip:perf/urgent] hw-breakpoints: Handle bad modify_user_hw_breakpoint off-case return value
Commit-ID: 99ac64c826e62a07e5818cfde620be4d524f1edf Gitweb: http://git.kernel.org/tip/99ac64c826e62a07e5818cfde620be4d524f1edf Author: Frederic Weisbecker <[email protected]> AuthorDate: Fri, 11 Dec 2009 11:58:42 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 11 Dec 2009 12:03:53 +0100
hw-breakpoints: Handle bad modify_user_hw_breakpoint off-case return value
While converting modify_user_hw_breakpoint() return value, we forgot to handle the off-case. It's not returning a pointer anymore.
This solves the build warning reported by Stephen Rothwell against linux-next.
LKML-Reference: <[email protected]>
--- include/linux/hw_breakpoint.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/hw_breakpoint.h +1 -1
@@ -93,7 +93,7 @@ register_user_hw_breakpoint(struct perf_event_attr *attr, struct task_struct *tsk) { return NULL; }static inline int modify_user_hw_breakpoint (struct perf_event *bp, -struct perf_event_attr *attr) {return NULL ; } +struct perf_event_attr *attr) {return -ENOSYS ; }static inline struct perf_event * register_wide_hw_breakpoint_cpu(struct perf_event_attr *attr, perf_overflow_handler_t triggered,