From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Daney Subject: Re: [PATCH 2/3] mips: Avoid raw handling of cpu_possible_map/cpu_online_map Date: Mon, 27 Feb 2012 14:19:42 -0800 Message-ID: <4F4C017E.5040200@gmail.com> References: <87wr7pbwbz.fsf@rustcorp.com.au> <1329259784-20592-1-git-send-email-venki@google.com> <1329259784-20592-3-git-send-email-venki@google.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=v5+YM8hml6+i8Iax0JgTRrVxE1ZmxHQPlVPNMAQcZuw=; b=HnlQie5ii6rX3PKCubgaOothaW3keVKCe1XFfwsD21ECuz9QyShc2RmyGBef4mOtZI rk6s99mZlZPZsr2+Ool4RSsX8iCRc4Bvb0zg2HLXh+yG0lEvhwop+++h5XYl5WnH5Lgn CTVeQf0FwNcav25O1Bg4P9C1bB6Tt9EwI7bo0= In-Reply-To: <1329259784-20592-3-git-send-email-venki@google.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="us-ascii"; format="flowed" To: Venkatesh Pallipadi , Ralf Baechle Cc: Rusty Russell , Tony Luck , "Srivatsa S. Bhat" , Andrew Morton , KOSAKI Motohiro , KOSAKI Motohiro , Mike Travis , "Paul E. McKenney" , "Rafael J. Wysocki" , Paul Gortmaker , linux-kernel@vger.kernel.org, Richard Kuo , linux-hexagon@vger.kernel.org, linux-mips@linux-mips.org, Jeff Dike , Richard Weinberger , user-mode-linux-devel@lists.sourceforge.net On 02/14/2012 02:49 PM, Venkatesh Pallipadi wrote: > Use set_cpu_* and init_cpu_* variants instead. > > Signed-off-by: Venkatesh Pallipadi I came up with the same thing, so... Acked-by: David Daney Ralf: If you too were to Acknowledge the patch, we might get it merged. David Daney > --- > arch/mips/cavium-octeon/smp.c | 2 +- > arch/mips/kernel/smp.c | 4 ++-- > arch/mips/netlogic/xlr/smp.c | 4 ++-- > arch/mips/pmc-sierra/yosemite/smp.c | 4 ++-- > arch/mips/sgi-ip27/ip27-smp.c | 2 +- > arch/mips/sibyte/bcm1480/smp.c | 5 ++--- > arch/mips/sibyte/sb1250/smp.c | 5 ++--- > 7 files changed, 12 insertions(+), 14 deletions(-) > > diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c > index efcfff4..5cce09c 100644 > --- a/arch/mips/cavium-octeon/smp.c > +++ b/arch/mips/cavium-octeon/smp.c > @@ -268,7 +268,7 @@ static int octeon_cpu_disable(void) > > spin_lock(&smp_reserve_lock); > > - cpu_clear(cpu, cpu_online_map); > + set_cpu_online(cpu, false); > cpu_clear(cpu, cpu_callin_map); > local_irq_disable(); > fixup_irqs(); > diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c > index 32c1e95..28777ff 100644 > --- a/arch/mips/kernel/smp.c > +++ b/arch/mips/kernel/smp.c > @@ -148,7 +148,7 @@ static void stop_this_cpu(void *dummy) > /* > * Remove this CPU: > */ > - cpu_clear(smp_processor_id(), cpu_online_map); > + set_cpu_online(smp_processor_id(), false); > for (;;) { > if (cpu_wait) > (*cpu_wait)(); /* Wait if available. */ > @@ -248,7 +248,7 @@ int __cpuinit __cpu_up(unsigned int cpu) > while (!cpu_isset(cpu, cpu_callin_map)) > udelay(100); > > - cpu_set(cpu, cpu_online_map); > + set_cpu_online(cpu, true); > > return 0; > } > diff --git a/arch/mips/netlogic/xlr/smp.c b/arch/mips/netlogic/xlr/smp.c > index 080284d..8084221 100644 > --- a/arch/mips/netlogic/xlr/smp.c > +++ b/arch/mips/netlogic/xlr/smp.c > @@ -154,7 +154,7 @@ void __init nlm_smp_setup(void) > cpu_set(boot_cpu, phys_cpu_present_map); > __cpu_number_map[boot_cpu] = 0; > __cpu_logical_map[0] = boot_cpu; > - cpu_set(0, cpu_possible_map); > + set_cpu_possible(0, true); > > num_cpus = 1; > for (i = 0; i< NR_CPUS; i++) { > @@ -166,7 +166,7 @@ void __init nlm_smp_setup(void) > cpu_set(i, phys_cpu_present_map); > __cpu_number_map[i] = num_cpus; > __cpu_logical_map[num_cpus] = i; > - cpu_set(num_cpus, cpu_possible_map); > + set_cpu_possible(num_cpus, true); > ++num_cpus; > } > } > diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c > index 2608752..b2b23eb 100644 > --- a/arch/mips/pmc-sierra/yosemite/smp.c > +++ b/arch/mips/pmc-sierra/yosemite/smp.c > @@ -155,10 +155,10 @@ static void __init yos_smp_setup(void) > { > int i; > > - cpus_clear(cpu_possible_map); > + init_cpu_possible(cpumask_of(0)); > > for (i = 0; i< 2; i++) { > - cpu_set(i, cpu_possible_map); > + set_cpu_possible(i, true); > __cpu_number_map[i] = i; > __cpu_logical_map[i] = i; > } > diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c > index c6851df..735b43b 100644 > --- a/arch/mips/sgi-ip27/ip27-smp.c > +++ b/arch/mips/sgi-ip27/ip27-smp.c > @@ -76,7 +76,7 @@ static int do_cpumask(cnodeid_t cnode, nasid_t nasid, int highest) > /* Only let it join in if it's marked enabled */ > if ((acpu->cpu_info.flags& KLINFO_ENABLE)&& > (tot_cpus_found != NR_CPUS)) { > - cpu_set(cpuid, cpu_possible_map); > + set_cpu_possible(cpuid, true); > alloc_cpupda(cpuid, tot_cpus_found); > cpus_found++; > tot_cpus_found++; > diff --git a/arch/mips/sibyte/bcm1480/smp.c b/arch/mips/sibyte/bcm1480/smp.c > index d667875..63d2211 100644 > --- a/arch/mips/sibyte/bcm1480/smp.c > +++ b/arch/mips/sibyte/bcm1480/smp.c > @@ -147,14 +147,13 @@ static void __init bcm1480_smp_setup(void) > { > int i, num; > > - cpus_clear(cpu_possible_map); > - cpu_set(0, cpu_possible_map); > + init_cpu_possible(cpumask_of(0)); > __cpu_number_map[0] = 0; > __cpu_logical_map[0] = 0; > > for (i = 1, num = 0; i< NR_CPUS; i++) { > if (cfe_cpu_stop(i) == 0) { > - cpu_set(i, cpu_possible_map); > + set_cpu_possible(i, true); > __cpu_number_map[i] = ++num; > __cpu_logical_map[num] = i; > } > diff --git a/arch/mips/sibyte/sb1250/smp.c b/arch/mips/sibyte/sb1250/smp.c > index 38e7f6b..77f0df5 100644 > --- a/arch/mips/sibyte/sb1250/smp.c > +++ b/arch/mips/sibyte/sb1250/smp.c > @@ -135,14 +135,13 @@ static void __init sb1250_smp_setup(void) > { > int i, num; > > - cpus_clear(cpu_possible_map); > - cpu_set(0, cpu_possible_map); > + init_cpu_possible(cpumask_of(0)); > __cpu_number_map[0] = 0; > __cpu_logical_map[0] = 0; > > for (i = 1, num = 0; i< NR_CPUS; i++) { > if (cfe_cpu_stop(i) == 0) { > - cpu_set(i, cpu_possible_map); > + set_cpu_possible(i, true); > __cpu_number_map[i] = ++num; > __cpu_logical_map[num] = i; > }