diff -u 2.6/include/asm-generic/cpumask_arith.h build-2.6/include/asm-generic/cpumask_arith.h
--- 2.6/include/asm-generic/cpumask_arith.h	2004-05-23 21:08:51.000000000 +0200
+++ build-2.6/include/asm-generic/cpumask_arith.h	2004-05-29 10:34:53.000000000 +0200
@@ -6,10 +6,10 @@
  * to contain the whole cpu bitmap.
  */
 
-#define cpu_set(cpu, map)		set_bit(cpu, &(map))
-#define cpu_clear(cpu, map)		clear_bit(cpu, &(map))
+#define cpu_set(cpu, map)		__set_bit(cpu, &(map))
+#define cpu_clear(cpu, map)		__clear_bit(cpu, &(map))
 #define cpu_isset(cpu, map)		test_bit(cpu, &(map))
-#define cpu_test_and_set(cpu, map)	test_and_set_bit(cpu, &(map))
+#define cpu_test_and_set(cpu, map)	__test_and_set_bit(cpu, &(map))
 
 #define cpus_and(dst,src1,src2)		do { dst = (src1) & (src2); } while (0)
 #define cpus_or(dst,src1,src2)		do { dst = (src1) | (src2); } while (0)
diff -u 2.6/include/asm-generic/cpumask_array.h build-2.6/include/asm-generic/cpumask_array.h
--- 2.6/include/asm-generic/cpumask_array.h	2004-05-23 21:08:51.000000000 +0200
+++ build-2.6/include/asm-generic/cpumask_array.h	2004-05-29 10:35:19.000000000 +0200
@@ -9,10 +9,10 @@
 
 #define CPU_ARRAY_SIZE		BITS_TO_LONGS(NR_CPUS)
 
-#define cpu_set(cpu, map)		set_bit(cpu, (map).mask)
-#define cpu_clear(cpu, map)		clear_bit(cpu, (map).mask)
-#define cpu_isset(cpu, map)		test_bit(cpu, (map).mask)
-#define cpu_test_and_set(cpu, map)	test_and_set_bit(cpu, (map).mask)
+#define cpu_set(cpu, map)		__set_bit(cpu, (map).mask)
+#define cpu_clear(cpu, map)		__clear_bit(cpu, (map).mask)
+#define cpu_isset(cpu, map)		__test_bit(cpu, (map).mask)
+#define cpu_test_and_set(cpu, map)	__test_and_set_bit(cpu, (map).mask)
 
 #define cpus_and(dst,src1,src2)	bitmap_and((dst).mask,(src1).mask, (src2).mask, NR_CPUS)
 #define cpus_or(dst,src1,src2)	bitmap_or((dst).mask, (src1).mask, (src2).mask, NR_CPUS)
diff -u 2.6/include/asm-generic/cpumask_up.h build-2.6/include/asm-generic/cpumask_up.h
--- 2.6/include/asm-generic/cpumask_up.h	2004-01-09 07:59:19.000000000 +0100
+++ build-2.6/include/asm-generic/cpumask_up.h	2004-05-29 10:41:25.000000000 +0200
@@ -6,7 +6,7 @@
 #define cpu_set(cpu, map)		do { (void)(cpu); cpus_coerce(map) = 1UL; } while (0)
 #define cpu_clear(cpu, map)		do { (void)(cpu); cpus_coerce(map) = 0UL; } while (0)
 #define cpu_isset(cpu, map)		((void)(cpu), cpus_coerce(map) != 0UL)
-#define cpu_test_and_set(cpu, map)	((void)(cpu), test_and_set_bit(0, &(map)))
+#define cpu_test_and_set(cpu, map)	((void)(cpu), __test_and_set_bit(0, &(map)))
 
 #define cpus_and(dst, src1, src2)					\
 	do {								\