diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-07-03 12:25:58 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-04 10:53:16 -0400 |
commit | 8c976e34516c9e134488babbb95af182340370c8 (patch) | |
tree | 21a8e281d4cfd5a4ecf6c0c213cb4494323ac5a2 | |
parent | 83d0f2332edb3001617e6a292c4412ae5f2bf659 (diff) |
[MIPS] VSMP: Fix initialization ordering bug.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/kernel/smp-mt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c index b8fa7ddd78f6..19b30d6f1727 100644 --- a/arch/mips/kernel/smp-mt.c +++ b/arch/mips/kernel/smp-mt.c | |||
@@ -236,8 +236,6 @@ void __init plat_smp_setup(void) | |||
236 | dvpe(); | 236 | dvpe(); |
237 | dmt(); | 237 | dmt(); |
238 | 238 | ||
239 | mips_mt_set_cpuoptions(); | ||
240 | |||
241 | /* Put MVPE's into 'configuration state' */ | 239 | /* Put MVPE's into 'configuration state' */ |
242 | set_c0_mvpcontrol(MVPCONTROL_VPC); | 240 | set_c0_mvpcontrol(MVPCONTROL_VPC); |
243 | 241 | ||
@@ -263,6 +261,8 @@ void __init plat_smp_setup(void) | |||
263 | 261 | ||
264 | void __init plat_prepare_cpus(unsigned int max_cpus) | 262 | void __init plat_prepare_cpus(unsigned int max_cpus) |
265 | { | 263 | { |
264 | mips_mt_set_cpuoptions(); | ||
265 | |||
266 | /* set up ipi interrupts */ | 266 | /* set up ipi interrupts */ |
267 | if (cpu_has_vint) { | 267 | if (cpu_has_vint) { |
268 | set_vi_handler(MIPS_CPU_IPI_RESCHED_IRQ, ipi_resched_dispatch); | 268 | set_vi_handler(MIPS_CPU_IPI_RESCHED_IRQ, ipi_resched_dispatch); |