Re: 2.6.0-test5-mm1
From: William Lee Irwin III <hidden>
Date: 2003-09-11 06:52:52
Also in:
lkml
On Mon, Sep 08, 2003 at 11:50:28PM -0700, Andrew Morton wrote:
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.0-test5/2.6.0-test5-mm1/ Small fixes, mainly.
Here's another one. any_online_cpu() is required to and with cpu_online_map before attempting to find an online cpu somewhere in the map; this patch adds that logic to the implementation(s) of any_online_cpu(). Untested, but apparently necessary e.g. for set_cpus_allowed() not to oops. -- wli ===== include/asm-generic/cpumask_arith.h 1.1 vs edited =====
--- 1.1/include/asm-generic/cpumask_arith.h Mon Aug 18 19:46:23 2003
+++ edited/include/asm-generic/cpumask_arith.h Wed Sep 10 23:46:36 2003@@ -27,7 +27,12 @@ #define cpus_shift_right(dst, src, n) do { dst = (src) >> (n); } while (0) #define cpus_shift_left(dst, src, n) do { dst = (src) << (n); } while (0) -#define any_online_cpu(map) ({ (map) ? first_cpu(map) : NR_CPUS; }) +#define any_online_cpu(map) \ +({ \ + cpumask_t __tmp__; \ + cpus_and(__tmp__, map, cpu_online_map); \ + __tmp__ ? first_cpu(__tmp__) : NR_CPUS; \ +}) #define CPU_MASK_ALL (~((cpumask_t)0) >> (8*sizeof(cpumask_t) - NR_CPUS)) #define CPU_MASK_NONE ((cpumask_t)0)
===== include/asm-generic/cpumask_array.h 1.1 vs edited =====
--- 1.1/include/asm-generic/cpumask_array.h Mon Aug 18 19:46:23 2003
+++ edited/include/asm-generic/cpumask_array.h Wed Sep 10 23:46:05 2003@@ -36,7 +36,13 @@ cpu_set(cpu, __cpu_mask); \ __cpu_mask; \ }) -#define any_online_cpu(map) find_first_bit((map).mask, NR_CPUS) +#define any_online_cpu(map) \ +({ \ + cpumask_t __tmp__; \ + cpus_and(__tmp__, map, cpu_online_map); \ + find_first_bit(__tmp__.mask, NR_CPUS); \ +}) + /* * um, these need to be usable as static initializers --
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"aart@kvack.org"> aart@kvack.org </a>