diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2009-06-23 12:36:08 -0700 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2009-08-04 16:02:01 +0200 |
| commit | 4680e64a88c4ce2c4e736dade99233e3def13fa7 (patch) | |
| tree | 0577ed4d742e0e0adc882aef4e9a9106ec6c4a14 /arch | |
| parent | 54a0bf3c2cad3fd118ea725f26a493aece6ea01d (diff) | |
| download | op-kernel-dev-4680e64a88c4ce2c4e736dade99233e3def13fa7.zip op-kernel-dev-4680e64a88c4ce2c4e736dade99233e3def13fa7.tar.gz | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/oprofile/op_model_amd.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c index 37d19c7..39686c2 100644 --- a/arch/x86/oprofile/op_model_amd.c +++ b/arch/x86/oprofile/op_model_amd.c @@ -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) { } |
