aboutsummaryrefslogtreecommitdiff
path: root/kernel/trace
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2009-11-26 05:35:42 +0100
committerIngo Molnar <mingo@elte.hu>2009-11-26 09:29:21 +0100
commit605bfaee9078cd0b01d83402315389839ee4bb5c (patch)
tree35c3af269b37347b689b3b212fc99d4ae9f719e5 /kernel/trace
parentc6567f642e20bcc79abed030f44be5b0d6da2ded (diff)
hw-breakpoints: Simplify error handling in breakpoint creation requests
This simplifies the error handling when we create a breakpoint. We don't need to check the NULL return value corner case anymore since we have improved perf_event_create_kernel_counter() to always return an error code in the failure case. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Prasad <prasad@linux.vnet.ibm.com> LKML-Reference: <1259210142-5714-3-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/trace_ksym.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/kernel/trace/trace_ksym.c b/kernel/trace/trace_ksym.c
index 9f040e42f51..c538b15b95d 100644
--- a/kernel/trace/trace_ksym.c
+++ b/kernel/trace/trace_ksym.c
@@ -200,12 +200,9 @@ int process_new_ksym_entry(char *ksymname, int op, unsigned long addr)
entry->ksym_hbp = register_wide_hw_breakpoint(entry->ksym_addr,
entry->len, entry->type,
ksym_hbp_handler, true);
+
if (IS_ERR(entry->ksym_hbp)) {
- entry->ksym_hbp = NULL;
ret = PTR_ERR(entry->ksym_hbp);
- }
-
- if (!entry->ksym_hbp) {
printk(KERN_INFO "ksym_tracer request failed. Try again"
" later!!\n");
goto err;
@@ -332,21 +329,16 @@ static ssize_t ksym_trace_filter_write(struct file *file,
if (changed) {
unregister_wide_hw_breakpoint(entry->ksym_hbp);
entry->type = op;
+ ret = 0;
if (op > 0) {
entry->ksym_hbp =
register_wide_hw_breakpoint(entry->ksym_addr,
entry->len, entry->type,
ksym_hbp_handler, true);
if (IS_ERR(entry->ksym_hbp))
- entry->ksym_hbp = NULL;
-
- /* modified without problem */
- if (entry->ksym_hbp) {
- ret = 0;
+ ret = PTR_ERR(entry->ksym_hbp);
+ else
goto out;
- }
- } else {
- ret = 0;
}
/* Error or "symbol:---" case: drop it */
ksym_filter_entry_count--;