diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-03-03 14:13:08 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:40:56 +0200 |
| commit | 89b08200ad8bc8fb860da218c4f3bcc292bf286c (patch) | |
| tree | e298a805491494fef4083bd452fe5e9b712626d5 /arch/x86/kernel/mpparse_64.c | |
| parent | 69c18c15d39c4622c6e2f97e5db4d8c9c43adaaa (diff) | |
| download | op-kernel-dev-89b08200ad8bc8fb860da218c4f3bcc292bf286c.zip op-kernel-dev-89b08200ad8bc8fb860da218c4f3bcc292bf286c.tar.gz | |
x86: make x86_64 accept the max_cpus parameter
The parameter passing parsing is done in the common smpboot.c
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/mpparse_64.c')
| -rw-r--r-- | arch/x86/kernel/mpparse_64.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c index 72ab140..2a1f788 100644 --- a/arch/x86/kernel/mpparse_64.c +++ b/arch/x86/kernel/mpparse_64.c @@ -32,6 +32,7 @@ /* Have we found an MP table */ int smp_found_config; +unsigned int __cpuinitdata maxcpus = NR_CPUS; /* * Various Linux-internal data structures created from the @@ -115,6 +116,12 @@ static void __cpuinit MP_processor_info(struct mpc_config_processor *m) return; } + if (num_processors >= maxcpus) { + printk(KERN_WARNING "WARNING: maxcpus limit of %i reached." + " Processor ignored.\n", maxcpus); + return; + } + num_processors++; cpus_complement(tmp_map, cpu_present_map); cpu = first_cpu(tmp_map); |
