openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

arch/x86/oprofile/op_model_amd.c: fix op_amd_handle_ibs() return type 

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

Fix this by making op_amd_handle_ibs() return void.

Cc: Robert Richter <robert.richter@amd.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Robert Richter <robert.richter@amd.com>
This commit is contained in:
Andrew Morton 2009-06-23 12:36:08 -07:00 committed by Robert Richter
parent 54a0bf3c2c
commit 4680e64a88
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/oprofile/op_model_amd.c
View File

@ -187,7 +187,7 @@ static void op_amd_setup_ctrs(struct op_x86_model_spec const *model,
#ifdef CONFIG_OPROFILE_IBS
static inline int
static inline void
op_amd_handle_ibs(struct pt_regs * const regs,
struct op_msrs const * const msrs)
{
@ -195,7 +195,7 @@ op_amd_handle_ibs(struct pt_regs * const regs,
struct op_entry entry;
if (!has_ibs)
return 1;
return;
if (ibs_config.fetch_enabled) {
rdmsrl(MSR_AMD64_IBSFETCHCTL, ctl);
@ -241,8 +241,6 @@ op_amd_handle_ibs(struct pt_regs * const regs,
wrmsrl(MSR_AMD64_IBSOPCTL, ctl);
}
}
return 1;
}
static inline void op_amd_start_ibs(void)
@ -276,7 +274,7 @@ static void op_amd_stop_ibs(void)
#else
static inline int op_amd_handle_ibs(struct pt_regs * const regs,
static inline void op_amd_handle_ibs(struct pt_regs * const regs,
struct op_msrs const * const msrs) { }
static inline void op_amd_start_ibs(void) { }
static inline void op_amd_stop_ibs(void) { }