diff options
author | Robert Richter <robert.richter@amd.com> | 2009-08-04 09:52:38 -0400 |
---|---|---|
committer | Robert Richter <robert.richter@amd.com> | 2009-08-04 09:53:36 -0400 |
commit | 54a0bf3c2cad3fd118ea725f26a493aece6ea01d (patch) | |
tree | 970d7d44cef6ef17b76a52cd04c4240b759dfbe6 /arch/x86/oprofile | |
parent | c550091edd6fac2ed9dac1b30d986b6c58b216fa (diff) |
Revert "x86: oprofile/op_model_amd.c set return values for op_amd_handle_ibs()"
This reverts commit 21e70878215f620fe99ea7d7c74bc641aeec932f.
Instead Andrew's patch will be applied he posted at the same time.
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/x86/oprofile')
-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 | ||