diff -Nurp --exclude-from=/home/mcd/.dontdiff linux-2.6.4-pj_nodemask/include/linux/mask.h linux-2.6.4-mask_h-mcd/include/linux/mask.h --- linux-2.6.4-pj_nodemask/include/linux/mask.h Tue Mar 30 17:04:27 2004 +++ linux-2.6.4-mask_h-mcd/include/linux/mask.h Wed Mar 31 15:59:36 2004 @@ -1,5 +1,5 @@ -#ifndef _ASM_GENERIC_MASK_H -#define _ASM_GENERIC_MASK_H +#ifndef __LINUX_MASK_H +#define __LINUX_MASK_H /* * include/linux/mask.h @@ -273,7 +273,7 @@ do { \ } while(0) #define mask_complement(dst, src, nbits) \ - bitmap_complement((dst)._m, (src)._m, nbits) + bitmap_complement((dst)._m, (src)._m, (nbits)) #define mask_equal(mask1, mask2) \ ({ \ @@ -369,4 +369,4 @@ do { \ #define mask_parse(ubuf, ulen, mask, nbits) \ bitmap_parse((ubuf), (ulen), ((mask)._m), (nbits)) -#endif /* _ASM_GENERIC_MASK_H */ +#endif /* __LINUX_MASK_H */