diff options
| -rw-r--r-- | arch/x86/oprofile/op_model_amd.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c index 827beecb67a4..37d19c768d5f 100644 --- a/arch/x86/oprofile/op_model_amd.c +++ b/arch/x86/oprofile/op_model_amd.c | |||
| @@ -195,7 +195,7 @@ op_amd_handle_ibs(struct pt_regs * const regs, | |||
| 195 | struct op_entry entry; | 195 | struct op_entry entry; |
| 196 | 196 | ||
| 197 | if (!has_ibs) | 197 | if (!has_ibs) |
| 198 | return 0; | 198 | return 1; |
| 199 | 199 | ||
| 200 | if (ibs_config.fetch_enabled) { | 200 | if (ibs_config.fetch_enabled) { |
| 201 | rdmsrl(MSR_AMD64_IBSFETCHCTL, ctl); | 201 | rdmsrl(MSR_AMD64_IBSFETCHCTL, ctl); |
| @@ -277,10 +277,7 @@ static void op_amd_stop_ibs(void) | |||
| 277 | #else | 277 | #else |
| 278 | 278 | ||
| 279 | static inline int op_amd_handle_ibs(struct pt_regs * const regs, | 279 | static inline int op_amd_handle_ibs(struct pt_regs * const regs, |
| 280 | struct op_msrs const * const msrs) | 280 | struct op_msrs const * const msrs) { } |
| 281 | { | ||
| 282 | return 0; | ||
| 283 | } | ||
| 284 | static inline void op_amd_start_ibs(void) { } | 281 | static inline void op_amd_start_ibs(void) { } |
| 285 | static inline void op_amd_stop_ibs(void) { } | 282 | static inline void op_amd_stop_ibs(void) { } |
| 286 | 283 | ||
