Merge remote-tracking branch 'unicore32/unicore32'

[deliverable/linux.git] / arch / mips / oprofile / op_model_mipsxx.c

diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index 8f988a61b7a850526e623733a969b405f7755fce..45cb27469fbaa14db9824f9635287b0507498354 100644 (file)
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -269,11 +269,9 @@ static int mipsxx_perfcount_handler(void)
        return handled;
 }
 
-#define M_CONFIG1_PC   (1 << 4)
-
 static inline int __n_counters(void)
 {
-       if (!(read_c0_config1() & M_CONFIG1_PC))
+       if (!cpu_has_perf)
                return 0;
        if (!(read_c0_perfctrl0() & M_PERFCTL_MORE))
                return 1;