Messages in this thread Patch in this message | | | Date | Mon, 19 Apr 2004 16:58:22 +1000 | From | Nick Piggin <> | Subject | Re: 2.6.6-rc1-mm1 |
| |
William Lee Irwin III wrote: > On Sun, Apr 18, 2004 at 11:01:31PM -0700, Andrew Morton wrote: > >>ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.6-rc1/2.6.6-rc1-mm1/ >>- All of the anonmm rmap work is now merged up. No pte chains. >>- Various cleanups and fixups, as usual. >>- The list of external bk trees is getting a little short, due to problems >> at bkbits.net. The ones which are here are not necessarily very up-to-date >> with the various development trees. > > > Okay, the cpumask_arith.h fixes aren't in here. What do I have to do to > get the bare minimal correctness fixes in this area propagated to mainline? >
Speaking of which, the CPU_MASK_ALL, CPU_MASK_NONE fix for cpumask_array.h still isn't there either.
It seems that in all the excitement a fix wasn't applied. Here is Linus' version, which is obviously the best one. linux-2.6-npiggin/include/asm-generic/cpumask_array.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff -puN include/asm-generic/cpumask.h~fix-big-cpumask include/asm-generic/cpumask.h diff -puN include/asm-generic/cpumask_array.h~fix-big-cpumask include/asm-generic/cpumask_array.h --- linux-2.6/include/asm-generic/cpumask_array.h~fix-big-cpumask 2004-04-19 16:51:55.000000000 +1000 +++ linux-2.6-npiggin/include/asm-generic/cpumask_array.h 2004-04-19 16:53:15.000000000 +1000 @@ -48,7 +48,7 @@ /* * um, these need to be usable as static initializers */ -#define CPU_MASK_ALL { {[0 ... CPU_ARRAY_SIZE-1] = ~0UL} } -#define CPU_MASK_NONE { {[0 ... CPU_ARRAY_SIZE-1] = 0UL} } +#define CPU_MASK_ALL ((cpumask_t) { {[0 ... CPU_ARRAY_SIZE-1] = ~0UL} }) +#define CPU_MASK_NONE ((cpumask_t) { {[0 ... CPU_ARRAY_SIZE-1] = 0UL} }) #endif /* __ASM_GENERIC_CPUMASK_ARRAY_H */ _
| |