diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /arch/mips/kernel/cpu-probe.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/mips/kernel/cpu-probe.c')
| -rw-r--r-- | arch/mips/kernel/cpu-probe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index ba08f055feb2..aa2caa67299a 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
| @@ -459,7 +459,7 @@ static inline unsigned int decode_config0(struct cpuinfo_mips *c) | |||
| 459 | isa = (config0 & MIPS_CONF_AT) >> 13; | 459 | isa = (config0 & MIPS_CONF_AT) >> 13; |
| 460 | switch (isa) { | 460 | switch (isa) { |
| 461 | case 0: | 461 | case 0: |
| 462 | switch ((config0 >> 10) & 7) { | 462 | switch ((config0 & MIPS_CONF_AR) >> 10) { |
| 463 | case 0: | 463 | case 0: |
| 464 | c->isa_level = MIPS_CPU_ISA_M32R1; | 464 | c->isa_level = MIPS_CPU_ISA_M32R1; |
| 465 | break; | 465 | break; |
| @@ -471,7 +471,7 @@ static inline unsigned int decode_config0(struct cpuinfo_mips *c) | |||
| 471 | } | 471 | } |
| 472 | break; | 472 | break; |
| 473 | case 2: | 473 | case 2: |
| 474 | switch ((config0 >> 10) & 7) { | 474 | switch ((config0 & MIPS_CONF_AR) >> 10) { |
| 475 | case 0: | 475 | case 0: |
| 476 | c->isa_level = MIPS_CPU_ISA_M64R1; | 476 | c->isa_level = MIPS_CPU_ISA_M64R1; |
| 477 | break; | 477 | break; |
| @@ -548,7 +548,7 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c) | |||
| 548 | return config3 & MIPS_CONF_M; | 548 | return config3 & MIPS_CONF_M; |
| 549 | } | 549 | } |
| 550 | 550 | ||
| 551 | static inline void decode_configs(struct cpuinfo_mips *c) | 551 | static void __init decode_configs(struct cpuinfo_mips *c) |
| 552 | { | 552 | { |
| 553 | /* MIPS32 or MIPS64 compliant CPU. */ | 553 | /* MIPS32 or MIPS64 compliant CPU. */ |
| 554 | c->options = MIPS_CPU_4KEX | MIPS_CPU_4K_CACHE | MIPS_CPU_COUNTER | | 554 | c->options = MIPS_CPU_4KEX | MIPS_CPU_4K_CACHE | MIPS_CPU_COUNTER | |