aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2009-08-04 15:52:38 +0200
committerRobert Richter <robert.richter@amd.com>2009-08-04 15:53:36 +0200
commit54a0bf3c2cad3fd118ea725f26a493aece6ea01d (patch)
tree970d7d44cef6ef17b76a52cd04c4240b759dfbe6 /arch/x86
parentc550091edd6fac2ed9dac1b30d986b6c58b216fa (diff)
downloadlinux-2.6.38-lt-ux500-54a0bf3c2cad3fd118ea725f26a493aece6ea01d.tar.gz
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')
-rw-r--r--arch/x86/oprofile/op_model_amd.c7
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 827beecb67a..37d19c768d5 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,
struct op_entry entry;
if (!has_ibs)
- return 0;
+ return 1;
if (ibs_config.fetch_enabled) {
rdmsrl(MSR_AMD64_IBSFETCHCTL, ctl);
@@ -277,10 +277,7 @@ static void op_amd_stop_ibs(void)
#else
static inline int op_amd_handle_ibs(struct pt_regs * const regs,
- struct op_msrs const * const msrs)
-{
- return 0;
-}
+ struct op_msrs const * const msrs) { }
static inline void op_amd_start_ibs(void) { }
static inline void op_amd_stop_ibs(void) { }