summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-07-27 20:46:25 -0700
committerDavid S. Miller <davem@davemloft.net>2011-07-27 20:46:25 -0700
commit314ff52727fe94dfbe07f3a9a489ab3ca8d8df5a (patch)
treedf8bbc25ebe7e6f0da73403c5e2b9def2c37f2df /arch
parent15e3608d7c273947dbf2eadbcaa66e51143928fb (diff)
downloadlinux-3.10-314ff52727fe94dfbe07f3a9a489ab3ca8d8df5a.tar.gz
linux-3.10-314ff52727fe94dfbe07f3a9a489ab3ca8d8df5a.tar.bz2
linux-3.10-314ff52727fe94dfbe07f3a9a489ab3ca8d8df5a.zip
sparc: Don't do expensive hypervisor PCR write unless necessary.
The hypervisor call is only necessary if hypervisor events are being requested. So if we're not tracking hypervisor events, simply do a direct register write. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/kernel/pcr.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/sparc/kernel/pcr.c b/arch/sparc/kernel/pcr.c
index 8ac23e66008..878c6824c73 100644
--- a/arch/sparc/kernel/pcr.c
+++ b/arch/sparc/kernel/pcr.c
@@ -80,8 +80,11 @@ static void n2_pcr_write(u64 val)
{
unsigned long ret;
- ret = sun4v_niagara2_setperf(HV_N2_PERF_SPARC_CTL, val);
- if (ret != HV_EOK)
+ if (val & PCR_N2_HTRACE) {
+ ret = sun4v_niagara2_setperf(HV_N2_PERF_SPARC_CTL, val);
+ if (ret != HV_EOK)
+ write_pcr(val);
+ } else
write_pcr(val);
}