diff options
Diffstat (limited to 'arch/mips/kernel/cpu-probe.c')
-rw-r--r-- | arch/mips/kernel/cpu-probe.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 442839e9578c..ab755ea26c6a 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/ptrace.h> | 16 | #include <linux/ptrace.h> |
17 | #include <linux/stddef.h> | 17 | #include <linux/stddef.h> |
18 | 18 | ||
19 | #include <asm/bugs.h> | ||
19 | #include <asm/cpu.h> | 20 | #include <asm/cpu.h> |
20 | #include <asm/fpu.h> | 21 | #include <asm/fpu.h> |
21 | #include <asm/mipsregs.h> | 22 | #include <asm/mipsregs.h> |
@@ -97,7 +98,7 @@ static void au1k_wait(void) | |||
97 | 98 | ||
98 | static int __initdata nowait = 0; | 99 | static int __initdata nowait = 0; |
99 | 100 | ||
100 | int __init wait_disable(char *s) | 101 | static int __init wait_disable(char *s) |
101 | { | 102 | { |
102 | nowait = 1; | 103 | nowait = 1; |
103 | 104 | ||
@@ -565,7 +566,7 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c) | |||
565 | if (config3 & MIPS_CONF3_VEIC) | 566 | if (config3 & MIPS_CONF3_VEIC) |
566 | c->options |= MIPS_CPU_VEIC; | 567 | c->options |= MIPS_CPU_VEIC; |
567 | if (config3 & MIPS_CONF3_MT) | 568 | if (config3 & MIPS_CONF3_MT) |
568 | c->ases |= MIPS_ASE_MIPSMT; | 569 | c->ases |= MIPS_ASE_MIPSMT; |
569 | 570 | ||
570 | return config3 & MIPS_CONF_M; | 571 | return config3 & MIPS_CONF_M; |
571 | } | 572 | } |