MIPS: Use current_cpu_type() instead of c->cputype

If current_cpu_type() is pre-defined in cpu-feature-overrides.h, This
may save about 10k for the compressed kernel image(vmlinuz).

Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/1901/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/bcm63xx/cpu.c b/arch/mips/bcm63xx/cpu.c
index 1b1b8a8..fd4e76c 100644 (file)
--- a/arch/mips/bcm63xx/cpu.c
+++ b/arch/mips/bcm63xx/cpu.c
@@ -299,14 +299,13 @@ static unsigned int detect_memory_size(void)
 void __init bcm63xx_cpu_init(void)
 {
        unsigned int tmp;
-       struct cpuinfo_mips *c = &current_cpu_data;
        unsigned int cpu = smp_processor_id();
        u32 chipid_reg;
 
        /* soc registers location depends on cpu type */
        chipid_reg = 0;
 
-       switch (c->cputype) {
+       switch (current_cpu_type()) {
        case CPU_BMIPS3300:
                if ((read_c0_prid() & PRID_IMP_MASK) != PRID_IMP_BMIPS3300_ALT)
                        __cpu_name[cpu] = "Broadcom BCM6338";

diff --git a/arch/mips/kernel/spram.c b/arch/mips/kernel/spram.c
index f9a693a..67f2495 100644 (file)
--- a/arch/mips/kernel/spram.c
+++ b/arch/mips/kernel/spram.c
@@ -197,10 +197,9 @@ static void probe_spram(char *type,
 }
 void spram_config(void)
 {
-       struct cpuinfo_mips *c = &current_cpu_data;
        unsigned int config0;
 
-       switch (c->cputype) {
+       switch (current_cpu_type()) {
        case CPU_24K:
        case CPU_34K:
        case CPU_74K:

diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index be407d5..6e5c9fd 100644 (file)
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -624,7 +624,7 @@ static void build_tlb_write_entry(u32 **p, struct uasm_label **l,
 
        default:
                panic("No TLB refill handler yet (CPU type: %d)",
-                     current_cpu_data.cputype);
+                     current_cpu_type());
                break;
        }
 }