diff options
author | David S. Miller <davem@davemloft.net> | 2011-07-27 23:46:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-15 21:31:40 -0400 |
commit | ce840177aaadf72f7d0fc7619bcbc12e4e8129bf (patch) | |
tree | dc9544a4551147f0a69c12ac6e84fa740d1fd438 /arch/sparc | |
parent | 7cc3d70509d05b40ae926b8f6c886abab7ace827 (diff) |
sparc: Don't do expensive hypervisor PCR write unless necessary.
[ Upstream commit 314ff52727fe94dfbe07f3a9a489ab3ca8d8df5a ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/kernel/pcr.c | 7 |
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) | |||
80 | { | 80 | { |
81 | unsigned long ret; | 81 | unsigned long ret; |
82 | 82 | ||
83 | ret = sun4v_niagara2_setperf(HV_N2_PERF_SPARC_CTL, val); | 83 | if (val & PCR_N2_HTRACE) { |
84 | if (ret != HV_EOK) | 84 | ret = sun4v_niagara2_setperf(HV_N2_PERF_SPARC_CTL, val); |
85 | if (ret != HV_EOK) | ||
86 | write_pcr(val); | ||
87 | } else | ||
85 | write_pcr(val); | 88 | write_pcr(val); |
86 | } | 89 | } |
87 | 90 | ||