On Sun, 5 Oct 2008, Ingo Molnar wrote:Please lets get rid of all this. Thanks, tglx ----------------> From 344707c1f43dd0d080828497aacb60c0cc0a8c13 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Sun, 5 Oct 2008 17:27:56 +0200 Subject: [PATCH] x86, smpboot: remove additional_cpus remove remainder of additional_cpus logic. We now just listen to the disabled_cpus value like we did for years. disabled_cpus is always >= 0 so no need for an extra check. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- arch/x86/kernel/smpboot.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 3868018..d6a4d95 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1260,8 +1260,6 @@ void __init native_smp_cpus_done(unsigned int max_cpus) check_nmi_watchdog(); } -static int additional_cpus = -1; - /* * cpu_possible_map should be static, it cannot change as cpu's * are onlined, or offlined. The reason is per-cpu data-structures @@ -1281,21 +1279,13 @@ static int additional_cpus = -1; */ __init void prefill_possible_map(void) { - int i; - int possible; + int i, possible; /* no processor from mptable or madt */ if (!num_processors) num_processors = 1; - if (additional_cpus == -1) { - if (disabled_cpus > 0) - additional_cpus = disabled_cpus; - else - additional_cpus = 0; - } - - possible = num_processors + additional_cpus; + possible = num_processors + disabled_cpus; if (possible > NR_CPUS) possible = NR_CPUS; --
| Florian Lohoff | BUG: scheduling while atomic: ifconfig/0x00000002/4170 |
| Greg KH | [GIT PATCH] driver core patches against 2.6.24 |
| Bart Van Assche | Integration of SCST in the mainstream Linux kernel |
| Bryan Woods | Stardom SATA HSM violation |
git: | |
| Abdelrazak Younes | Git-windows and git-svn? |
| Shawn O. Pearce | libgit2 - a true git library |
| Elijah Newren | Trying to use git-filter-branch to compress history by removing large, obsolete bi... |
| Bill Lear | Error "fatal: cannot pread pack file: Success" |
| Richard Stallman | Real men don't attack straw men |
| Mark Thomas | [i386/Thinkpad T41]USB mouse + Xorg obsd 4.1 |
| GVG GVG | ssh_exchange_identification: Connection closed by remote host |
| Patrick Hemmen | ipsec with carp |
| Johann Baudy | Packet mmap: TX RING and zero copy |
| David Miller | Re: [GIT]: Networking |
| Jarek Poplawski | [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
| Gerrit Renker | [PATCH 0/37] dccp: Feature negotiation - last call for comments |
