From: Adrian Bunk <bunk@stusta.de>
To: linux-kernel@vger.kernel.org
Subject: [2.6 patch] i386/x86_64 mpparse.c: kill maxcpus
Date: Sun, 20 Mar 2005 20:25:49 +0100 [thread overview]
Message-ID: <20050320192549.GP4449@stusta.de> (raw)
Do we really need a global variable that does only hold the value of
NR_CPUS?
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
arch/i386/kernel/mpparse.c | 7 +++----
arch/i386/mach-visws/mpparse.c | 6 ++----
arch/x86_64/kernel/mpparse.c | 7 +++----
3 files changed, 8 insertions(+), 12 deletions(-)
--- linux-2.6.11-mm4-full/arch/i386/kernel/mpparse.c.old 2005-03-20 19:54:21.000000000 +0100
+++ linux-2.6.11-mm4-full/arch/i386/kernel/mpparse.c 2005-03-20 19:56:17.000000000 +0100
@@ -37,7 +37,6 @@
/* Have we found an MP table */
int smp_found_config;
-unsigned int __initdata maxcpus = NR_CPUS;
/*
* Various Linux-internal data structures created from the
@@ -189,9 +188,9 @@
return;
}
- if (num_processors >= maxcpus) {
- printk(KERN_WARNING "WARNING: maxcpus limit of %i reached."
- " Processor ignored.\n", maxcpus);
+ if (num_processors >= NR_CPUS) {
+ printk(KERN_WARNING "WARNING: NR_CPUS limit of %i reached."
+ " Processor ignored.\n", NR_CPUS);
return;
}
num_processors++;
--- linux-2.6.11-mm4-full/arch/i386/mach-visws/mpparse.c.old 2005-03-20 19:56:31.000000000 +0100
+++ linux-2.6.11-mm4-full/arch/i386/mach-visws/mpparse.c 2005-03-20 19:57:03.000000000 +0100
@@ -28,8 +28,6 @@
/* Bitmask of physically existing CPUs */
physid_mask_t phys_cpu_present_map;
-unsigned int __initdata maxcpus = NR_CPUS;
-
/*
* The Visual Workstation is Intel MP compliant in the hardware
* sense, but it doesn't have a BIOS(-configuration table).
@@ -90,8 +88,8 @@
ncpus = CO_CPU_MAX;
}
- if (ncpus > maxcpus)
- ncpus = maxcpus;
+ if (ncpus > NR_CPUS)
+ ncpus = NR_CPUS;
smp_found_config = 1;
while (ncpus--)
--- linux-2.6.11-mm4-full/arch/x86_64/kernel/mpparse.c.old 2005-03-20 19:58:45.000000000 +0100
+++ linux-2.6.11-mm4-full/arch/x86_64/kernel/mpparse.c 2005-03-20 19:59:04.000000000 +0100
@@ -33,7 +33,6 @@
/* Have we found an MP table */
int smp_found_config;
-unsigned int __initdata maxcpus = NR_CPUS;
int acpi_found_madt;
@@ -126,9 +125,9 @@
" Processor ignored.\n", NR_CPUS);
return;
}
- if (num_processors >= maxcpus) {
- printk(KERN_WARNING "WARNING: maxcpus limit of %i reached."
- " Processor ignored.\n", maxcpus);
+ if (num_processors >= NR_CPUS) {
+ printk(KERN_WARNING "WARNING: NR_CPUS limit of %i reached."
+ " Processor ignored.\n", NR_CPUS);
return;
}
next reply other threads:[~2005-03-20 19:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-20 19:25 Adrian Bunk [this message]
2005-03-20 22:42 ` [2.6 patch] i386/x86_64 mpparse.c: kill maxcpus Dave Jones
2005-03-20 23:12 ` Adrian Bunk
2005-03-20 23:32 ` Dave Jones
2005-03-20 23:59 ` Adrian Bunk
2005-03-21 0:01 ` Dave Jones
2005-03-21 0:45 ` Adrian Bunk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050320192549.GP4449@stusta.de \
--to=bunk@stusta.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox