summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2009-12-14 14:03:27 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-14 10:10:55 -0800
commit5185fb069972b653dd7177292e7510ff99d9e8aa (patch)
treef5380f93c457ab1fffa27a5a03ffee48106fbe60
parent464480f72e496067573e4f71bfbe3f5073d6fe33 (diff)
downloadlinux-stable-5185fb069972b653dd7177292e7510ff99d9e8aa.tar.gz
linux-stable-5185fb069972b653dd7177292e7510ff99d9e8aa.tar.bz2
linux-stable-5185fb069972b653dd7177292e7510ff99d9e8aa.zip
FRV: Fix no-hardware-breakpoint case
If there is no hardware breakpoint support, modify_user_hw_breakpoint() tries to return a NULL pointer through as an 'int' return value: In file included from kernel/exit.c:53: 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 Return 0 instead. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/hw_breakpoint.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hw_breakpoint.h b/include/linux/hw_breakpoint.h
index 69f07a9f1277..e268388146e8 100644
--- a/include/linux/hw_breakpoint.h
+++ b/include/linux/hw_breakpoint.h
@@ -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 0; }
static inline struct perf_event *
register_wide_hw_breakpoint_cpu(struct perf_event_attr *attr,
perf_overflow_handler_t triggered,