diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-09-21 18:09:00 +0200 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-15 12:50:41 +0200 |
| commit | fc889aa23f4767c1c3f77fce11e17bb0a638971f (patch) | |
| tree | 9d50e69bdfbc7fe87aa39868ca1a84ca25d90340 /arch/x86/oprofile | |
| parent | 4ac945f002c0bebdeb530cbc3729e22895e64a7e (diff) | |
| download | linux-fc889aa23f4767c1c3f77fce11e17bb0a638971f.tar.bz2 | |
oprofile, x86: Remove duplicate check for IBS_CAPS_OPCNT
Since oprofile is setting up ibs_op/dispatched_ops in the fs only if
the feature is available, its corresponding variable
ibs_config.dispatched_ops is only set, if the feature is
available. Thus the check is duplicate and can be removed.
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/x86/oprofile')
| -rw-r--r-- | arch/x86/oprofile/op_model_amd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c index 96852d5480e0..d5e9dab71bec 100644 --- a/arch/x86/oprofile/op_model_amd.c +++ b/arch/x86/oprofile/op_model_amd.c @@ -257,8 +257,7 @@ static inline void op_amd_start_ibs(void) ibs_op_ctl = min(ibs_op_ctl + IBS_RANDOM_MAXCNT_OFFSET, IBS_OP_MAX_CNT); } - if (ibs_caps & IBS_CAPS_OPCNT && ibs_config.dispatched_ops) - ibs_op_ctl |= IBS_OP_CNT_CTL; + ibs_op_ctl |= ibs_config.dispatched_ops ? IBS_OP_CNT_CTL : 0; ibs_op_ctl |= IBS_OP_ENABLE; val = op_amd_randomize_ibs_op(ibs_op_ctl); wrmsrl(MSR_AMD64_IBSOPCTL, val); |