From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756386AbYJTROb (ORCPT ); Mon, 20 Oct 2008 13:14:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752303AbYJTREV (ORCPT ); Mon, 20 Oct 2008 13:04:21 -0400 Received: from relay2.sgi.com ([192.48.171.30]:59561 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752819AbYJTRD0 (ORCPT ); Mon, 20 Oct 2008 13:03:26 -0400 Message-Id: <20081020170322.922269000@polaris-admin.engr.sgi.com> References: <20081020170319.539427000@polaris-admin.engr.sgi.com> User-Agent: quilt/0.46-1 Date: Mon, 20 Oct 2008 10:03:43 -0700 From: Mike Travis To: Ingo Molnar , Rusty Russell Cc: Andi Kleen , Andrew Morton , davej@codemonkey.org.uk, David Miller , Eric Dumazet , Jack Steiner , Jeremy Fitzhardinge , Jes Sorensen , "H. Peter Anvin" , peterz@infradead.org, Thomas Gleixner , Yinghai Lu , IA64 , PowerPC , S390 , SPARC , linux-kernel@vger.kernel.org Subject: [PATCH 24/35] cpumask: cpumask_any_but() Content-Disposition: inline; filename=cpumask:cpumask_any_but.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There's a common case where we want any online cpu except a particular one. This creates a helper to do that, otherwise we need a temp var and cpumask_andnot(). From: Rusty Russell Signed-off-by: Rusty Russell Signed-off-by: Mike Travis --- include/linux/cpumask.h | 3 +++ lib/cpumask.c | 10 ++++++++++ 2 files changed, 13 insertions(+) --- test-compile.orig/include/linux/cpumask.h +++ test-compile/include/linux/cpumask.h @@ -111,6 +111,7 @@ * * int cpumask_any(mask) Any cpu in mask * int cpumask_any_and(mask1,mask2) Any cpu in both masks + * int cpumask_any_but(mask,cpu) Any cpu in mask except cpu * * for_each_possible_cpu(cpu) for-loop cpu over cpu_possible_map * for_each_online_cpu(cpu) for-loop cpu over cpu_online_map @@ -458,6 +459,7 @@ extern cpumask_t cpu_mask_all; #define cpumask_first(src) ({ (void)(src); 0; }) #define cpumask_next(n, src) ({ (void)(src); 1; }) #define cpumask_next_and(n, srcp, andp) ({ (void)(srcp), (void)(andp); 1; }) +#define cpumask_any_but(mask, cpu) ({ (void)(mask); (void)(cpu); 0; }) #define for_each_cpu(cpu, mask) \ for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask) @@ -469,6 +471,7 @@ extern cpumask_t cpu_mask_all; int cpumask_first(const cpumask_t *srcp); int cpumask_next(int n, const cpumask_t *srcp); int cpumask_next_and(int n, const cpumask_t *srcp, const cpumask_t *andp); +int cpumask_any_but(const struct cpumask *mask, unsigned int cpu); #define for_each_cpu(cpu, mask) \ for ((cpu) = -1; \ --- test-compile.orig/lib/cpumask.c +++ test-compile/lib/cpumask.c @@ -24,6 +24,16 @@ int cpumask_next_and(int n, const cpumas } EXPORT_SYMBOL(cpumask_next_and); +int cpumask_any_but(const struct cpumask *mask, unsigned int cpu) +{ + unsigned int i; + + for_each_cpu(i, mask) + if (i != cpu) + break; + return i; +} + /* These are not inline because of header tangles. */ #ifdef CONFIG_CPUMASK_OFFSTACK bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags) --