From cce1e5c2cad6470c950290765f5c0c89685b3e17 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 27 Jul 2011 20:46:25 -0700 Subject: [PATCH] --- yaml --- r: 261081 b: refs/heads/master c: 314ff52727fe94dfbe07f3a9a489ab3ca8d8df5a h: refs/heads/master i: 261079: a108861652fd28fba729903950a3c9d6260d5d48 v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/pcr.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3db4e28b47f2..91ed37c89a66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15e3608d7c273947dbf2eadbcaa66e51143928fb +refs/heads/master: 314ff52727fe94dfbe07f3a9a489ab3ca8d8df5a diff --git a/trunk/arch/sparc/kernel/pcr.c b/trunk/arch/sparc/kernel/pcr.c index 8ac23e660080..878c6824c732 100644 --- a/trunk/arch/sparc/kernel/pcr.c +++ b/trunk/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); }