diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-04 09:26:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-04 09:26:44 -0700 |
| commit | 190045d53b9a8341e8600d6eb468b6081e903afb (patch) | |
| tree | b0fb0e19223f5e293f9fe3028dcac027d9934c47 /arch | |
| parent | e2baf4ed168589af8224d51f0ac50e65bcdee3f6 (diff) | |
| parent | 8c976e34516c9e134488babbb95af182340370c8 (diff) | |
| download | op-kernel-dev-190045d53b9a8341e8600d6eb468b6081e903afb.zip op-kernel-dev-190045d53b9a8341e8600d6eb468b6081e903afb.tar.gz | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] VSMP: Fix initialization ordering bug.
[MIPS] Add whitelists for checksyscalls.sh
[MIPS] die(): Properly declare as non-returning
[MIPS] Fix include wrapper symbol definitions in IP32 code.
Diffstat (limited to 'arch')
| -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 b8fa7dd..19b30d6 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) dvpe(); dmt(); - mips_mt_set_cpuoptions(); - /* Put MVPE's into 'configuration state' */ set_c0_mvpcontrol(MVPCONTROL_VPC); @@ -263,6 +261,8 @@ void __init plat_smp_setup(void) void __init plat_prepare_cpus(unsigned int max_cpus) { + mips_mt_set_cpuoptions(); + /* set up ipi interrupts */ if (cpu_has_vint) { set_vi_handler(MIPS_CPU_IPI_RESCHED_IRQ, ipi_resched_dispatch); |
