lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "x86: oprofile/op_model_amd.c set return values for op_amd_handle_ibs()"

Browse Source 
This reverts commit 21e7087821.

Instead Andrew's patch will be applied he posted at the same time.

Signed-off-by: Robert Richter <robert.richter@amd.com>
This commit is contained in:
Robert Richter
2009-08-04 15:52:38 +02:00
parent c550091edd
commit 54a0bf3c2c
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,7 +195,7 @@ op_amd_handle_ibs(struct pt_regs * const regs,
struct op_entry entry; struct op_entry entry;
if (!has_ibs) if (!has_ibs)
return 0; return 1;
if (ibs_config.fetch_enabled) { if (ibs_config.fetch_enabled) {
rdmsrl(MSR_AMD64_IBSFETCHCTL, ctl); rdmsrl(MSR_AMD64_IBSFETCHCTL, ctl);
@@ -277,10 +277,7 @@ static void op_amd_stop_ibs(void)
#else #else
static inline int op_amd_handle_ibs(struct pt_regs * const regs, static inline int op_amd_handle_ibs(struct pt_regs * const regs,
struct op_msrs const * const msrs) struct op_msrs const * const msrs) { }
{
return 0;
}
static inline void op_amd_start_ibs(void) { } static inline void op_amd_start_ibs(void) { }
static inline void op_amd_stop_ibs(void) { } static inline void op_amd_stop_ibs(void) { }