aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/oprofile
diff options
context:
space:
mode:
authorJaswinder Singh Rajput <jaswinder@kernel.org>2009-06-18 07:39:27 -0400
committerRobert Richter <robert.richter@amd.com>2009-06-18 10:44:38 -0400
commit21e70878215f620fe99ea7d7c74bc641aeec932f (patch)
tree191c16a40839ebe3428edfdc453d95f8b49df44a /arch/x86/oprofile
parent802070f5474af1a49435a9528aede47bb18abd47 (diff)
x86: oprofile/op_model_amd.c set return values for op_amd_handle_ibs()
op_amd_handle_ibs() should return 0 when IBS is not present or not defined. Fix compilation warning: CC [M] arch/x86/oprofile/op_model_amd.o arch/x86/oprofile/op_model_amd.c: In function ‘op_amd_handle_ibs’: arch/x86/oprofile/op_model_amd.c:217: warning: no return statement in function returning non-void Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/x86/oprofile')
-rw-r--r--arch/x86/oprofile/op_model_amd.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
index cc930467575d..e95268eb9220 100644
--- a/arch/x86/oprofile/op_model_amd.c
+++ b/arch/x86/oprofile/op_model_amd.c
@@ -132,7 +132,7 @@ op_amd_handle_ibs(struct pt_regs * const regs,
132 struct op_entry entry; 132 struct op_entry entry;
133 133
134 if (!has_ibs) 134 if (!has_ibs)
135 return 1; 135 return 0;
136 136
137 if (ibs_config.fetch_enabled) { 137 if (ibs_config.fetch_enabled) {
138 rdmsrl(MSR_AMD64_IBSFETCHCTL, ctl); 138 rdmsrl(MSR_AMD64_IBSFETCHCTL, ctl);
@@ -214,7 +214,10 @@ static void op_amd_stop_ibs(void)
214#else 214#else
215 215
216static inline int op_amd_handle_ibs(struct pt_regs * const regs, 216static inline int op_amd_handle_ibs(struct pt_regs * const regs,
217 struct op_msrs const * const msrs) { } 217 struct op_msrs const * const msrs)
218{
219 return 0;
220}
218static inline void op_amd_start_ibs(void) { } 221static inline void op_amd_start_ibs(void) { }
219static inline void op_amd_stop_ibs(void) { } 222static inline void op_amd_stop_ibs(void) { }
220 223