diff options
Diffstat (limited to 'arch/mips/kernel/smp-cmp.c')
-rw-r--r-- | arch/mips/kernel/smp-cmp.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/mips/kernel/smp-cmp.c b/arch/mips/kernel/smp-cmp.c index 3ef55fb7ac03..64d06f6a9adf 100644 --- a/arch/mips/kernel/smp-cmp.c +++ b/arch/mips/kernel/smp-cmp.c | |||
@@ -49,14 +49,11 @@ static void cmp_init_secondary(void) | |||
49 | 49 | ||
50 | /* Enable per-cpu interrupts: platform specific */ | 50 | /* Enable per-cpu interrupts: platform specific */ |
51 | 51 | ||
52 | #if defined(CONFIG_MIPS_MT_SMP) || defined(CONFIG_MIPS_MT_SMTC) | 52 | #ifdef CONFIG_MIPS_MT_SMP |
53 | if (cpu_has_mipsmt) | 53 | if (cpu_has_mipsmt) |
54 | c->vpe_id = (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) & | 54 | c->vpe_id = (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) & |
55 | TCBIND_CURVPE; | 55 | TCBIND_CURVPE; |
56 | #endif | 56 | #endif |
57 | #ifdef CONFIG_MIPS_MT_SMTC | ||
58 | c->tc_id = (read_c0_tcbind() & TCBIND_CURTC) >> TCBIND_CURTC_SHIFT; | ||
59 | #endif | ||
60 | } | 57 | } |
61 | 58 | ||
62 | static void cmp_smp_finish(void) | 59 | static void cmp_smp_finish(void) |
@@ -135,10 +132,6 @@ void __init cmp_smp_setup(void) | |||
135 | unsigned int mvpconf0 = read_c0_mvpconf0(); | 132 | unsigned int mvpconf0 = read_c0_mvpconf0(); |
136 | 133 | ||
137 | nvpe = ((mvpconf0 & MVPCONF0_PVPE) >> MVPCONF0_PVPE_SHIFT) + 1; | 134 | nvpe = ((mvpconf0 & MVPCONF0_PVPE) >> MVPCONF0_PVPE_SHIFT) + 1; |
138 | #elif defined(CONFIG_MIPS_MT_SMTC) | ||
139 | unsigned int mvpconf0 = read_c0_mvpconf0(); | ||
140 | |||
141 | nvpe = ((mvpconf0 & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1; | ||
142 | #endif | 135 | #endif |
143 | smp_num_siblings = nvpe; | 136 | smp_num_siblings = nvpe; |
144 | } | 137 | } |