diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-02-26 17:20:55 +0100 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-05-04 11:35:28 +0200 |
| commit | 8617f98c001d00b176422d707e6a67b88bcd7e0d (patch) | |
| tree | e857f11dcbc6e650f4d0c30839099358c814e537 /arch/x86/oprofile/op_x86_model.h | |
| parent | oprofile/x86: moving shutdown functions (diff) | |
| download | linux-8617f98c001d00b176422d707e6a67b88bcd7e0d.tar.xz linux-8617f98c001d00b176422d707e6a67b88bcd7e0d.zip | |
oprofile/x86: return -EBUSY if counters are already reserved
In case a counter is already reserved by the watchdog or perf_event
subsystem, oprofile ignored this counters silently. This case is
handled now and oprofile_setup() now reports an error.
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/x86/oprofile/op_x86_model.h')
| -rw-r--r-- | arch/x86/oprofile/op_x86_model.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h index ff82a755edd4..551401398fba 100644 --- a/arch/x86/oprofile/op_x86_model.h +++ b/arch/x86/oprofile/op_x86_model.h @@ -41,7 +41,7 @@ struct op_x86_model_spec { u16 event_mask; int (*init)(struct oprofile_operations *ops); void (*exit)(void); - void (*fill_in_addresses)(struct op_msrs * const msrs); + int (*fill_in_addresses)(struct op_msrs * const msrs); void (*setup_ctrs)(struct op_x86_model_spec const *model, struct op_msrs const * const msrs); int (*check_ctrs)(struct pt_regs * const regs, |