MIPS: cpu-probe: remove MIPS_CPU_BP_GHIST option bit

[sfrench/cifs-2.6.git] / arch / mips / kernel / cpu-probe.c

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index b8e073772bdb69f0a4ab129cab32330281122e3d..e6853697a056118eaf293f92a7a0d1e5e3550ffb 100644 (file)
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -1278,8 +1278,9 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                c->options = MIPS_CPU_TLB | MIPS_CPU_4K_CACHE | MIPS_CPU_4KEX |
                             MIPS_CPU_FPU | MIPS_CPU_32FPR |
                             MIPS_CPU_COUNTER | MIPS_CPU_WATCH |
-                            MIPS_CPU_LLSC | MIPS_CPU_BP_GHIST;
+                            MIPS_CPU_LLSC;
                c->tlbsize = 64;
+               write_c0_r10k_diag(read_c0_r10k_diag() | R10K_DIAG_E_GHIST);
                break;
        case PRID_IMP_R14000:
                if (((c->processor_id >> 4) & 0x0f) > 2) {
@@ -1293,8 +1294,9 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                c->options = MIPS_CPU_TLB | MIPS_CPU_4K_CACHE | MIPS_CPU_4KEX |
                             MIPS_CPU_FPU | MIPS_CPU_32FPR |
                             MIPS_CPU_COUNTER | MIPS_CPU_WATCH |
-                            MIPS_CPU_LLSC | MIPS_CPU_BP_GHIST;
+                            MIPS_CPU_LLSC;
                c->tlbsize = 64;
+               write_c0_r10k_diag(read_c0_r10k_diag() | R10K_DIAG_E_GHIST);
                break;
        case PRID_IMP_LOONGSON_64C:  /* Loongson-2/3 */
                switch (c->processor_id & PRID_REV_MASK) {
@@ -2054,10 +2056,6 @@ void cpu_probe(void)
        else
                cpu_set_nofpu_opts(c);
 
-       if (cpu_has_bp_ghist)
-               write_c0_r10k_diag(read_c0_r10k_diag() |
-                                  R10K_DIAG_E_GHIST);
-
        if (cpu_has_mips_r2_r6) {
                c->srsets = ((read_c0_srsctl() >> 26) & 0x0f) + 1;
                /* R2 has Performance Counter Interrupt indicator */