From 4ae624ec0e91be0faca93d47af79e18000f4970a Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Tue, 4 Aug 2009 15:52:38 +0200 Subject: [PATCH] --- yaml --- r: 158247 b: refs/heads/master c: 54a0bf3c2cad3fd118ea725f26a493aece6ea01d h: refs/heads/master i: 158245: 77410cbcf13cedf0990c57641432dab67eb26005 158243: dfb59baa0a27202b03603cbd0772df106f91ebc9 158239: 4e518950b8955c55a9dde06968f84b5f927ee7b1 v: v3 --- [refs] | 2 +- trunk/arch/x86/oprofile/op_model_amd.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a3b8ff448885..888cdeb0ab29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c550091edd6fac2ed9dac1b30d986b6c58b216fa +refs/heads/master: 54a0bf3c2cad3fd118ea725f26a493aece6ea01d diff --git a/trunk/arch/x86/oprofile/op_model_amd.c b/trunk/arch/x86/oprofile/op_model_amd.c index 827beecb67a4..37d19c768d5f 100644 --- a/trunk/arch/x86/oprofile/op_model_amd.c +++ b/trunk/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) { }