Skip to content

Commit

Permalink
arch/x86/oprofile/op_model_amd.c: fix op_amd_handle_ibs() return type
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew Morton authored and Robert Richter committed Aug 4, 2009
1 parent 54a0bf3 commit 4680e64
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions arch/x86/oprofile/op_model_amd.c
Original file line number Diff line number Diff line change
Expand Up @@ -187,15 +187,15 @@ 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)
{
u64 val, ctl;
struct op_entry entry;

if (!has_ibs)
return 1;
return;

if (ibs_config.fetch_enabled) {
rdmsrl(MSR_AMD64_IBSFETCHCTL, ctl);
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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) { }
Expand Down

0 comments on commit 4680e64

Please sign in to comment.