aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-10-16 13:05:25 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-28 10:02:13 -0700
commit7583ffeee9912de7313b9e3d75b5c9304c664e54 (patch)
tree075898a6da491ed79868f1129484d68a377785ec /include/linux
parent7f6df60755431d12897da745980316ad900d8b56 (diff)
downloadkernel_samsung_aries-7583ffeee9912de7313b9e3d75b5c9304c664e54.zip
kernel_samsung_aries-7583ffeee9912de7313b9e3d75b5c9304c664e54.tar.gz
kernel_samsung_aries-7583ffeee9912de7313b9e3d75b5c9304c664e54.tar.bz2
sparc64: Fix bit twiddling in sparc_pmu_enable_event().
[ Upstream commit e793d8c6740f8fe704fa216e95685f4d92c4c4b9 ] There was a serious disconnect in the logic happening in sparc_pmu_disable_event() vs. sparc_pmu_enable_event(). Event disable is implemented by programming a NOP event into the PCR. However, event enable was not reversing this operation. Instead, it was setting the User/Priv/Hypervisor trace enable bits. That's not sparc_pmu_enable_event()'s job, that's what sparc_pmu_enable() and sparc_pmu_disable() do . The intent of sparc_pmu_enable_event() is clear, since it first clear out the event type encoding field. So fix this by OR'ing in the event encoding rather than the trace enable bits. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions