diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-03 14:11:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-03 14:11:43 -0700 |
| commit | e105eabb5b843c6c59f921f54122221f82ca09e6 (patch) | |
| tree | b020c0e348cf858466a57bb21dd343b40bd405d4 /arch/mips/mti-malta/malta-smtc.c | |
| parent | 1db9b8373821f200dd71f4896ca7323c371620fe (diff) | |
| parent | 8531a35e5e275b17c57c39b7911bc2b37025f28c (diff) | |
| download | blackbird-op-linux-e105eabb5b843c6c59f921f54122221f82ca09e6.tar.gz blackbird-op-linux-e105eabb5b843c6c59f921f54122221f82ca09e6.zip | |
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] SMTC: Fix SMTC dyntick support.
[MIPS] SMTC: Close tiny holes in the SMTC IPI replay system.
[MIPS] SMTC: Fix holes in SMTC and FPU affinity support.
[MIPS] SMTC: Build fix: Fix filename in Makefile
[MIPS] Build fix: Fix irq flags type
Diffstat (limited to 'arch/mips/mti-malta/malta-smtc.c')
| -rw-r--r-- | arch/mips/mti-malta/malta-smtc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/mips/mti-malta/malta-smtc.c b/arch/mips/mti-malta/malta-smtc.c index 5ea705e49454..f84a46a8ae6e 100644 --- a/arch/mips/mti-malta/malta-smtc.c +++ b/arch/mips/mti-malta/malta-smtc.c @@ -84,12 +84,17 @@ static void msmtc_cpus_done(void) static void __init msmtc_smp_setup(void) { - mipsmt_build_cpu_map(0); + /* + * we won't get the definitive value until + * we've run smtc_prepare_cpus later, but + * we would appear to need an upper bound now. + */ + smp_num_siblings = smtc_build_cpu_map(0); } static void __init msmtc_prepare_cpus(unsigned int max_cpus) { - mipsmt_prepare_cpus(); + smtc_prepare_cpus(max_cpus); } struct plat_smp_ops msmtc_smp_ops = { |
