---

yaml --- r: 158247 b: refs/heads/master c: 54a0bf3 h: refs/heads/master i: 158245: 77410cb 158243: dfb59ba 158239: 4e51895 v: v3
git-mirror · Aug 4, 2009 · 4ae624e · 4ae624e
1 parent 5f6a334
commit 4ae624e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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) { }