Index: linux-2.6.16-mm2/include/linux/cpumask.h
===================================================================
--- linux-2.6.16-mm2.orig/include/linux/cpumask.h	2006-03-30 20:58:05.000000000 -0800
+++ linux-2.6.16-mm2/include/linux/cpumask.h	2006-03-30 20:29:59.000000000 -0800
@@ -89,13 +89,13 @@ typedef struct { DECLARE_BITMAP(bits, NR
 extern cpumask_t _unused_cpumask_arg_;
 
 #define cpu_set(cpu, dst) __cpu_set((cpu), &(dst))
-static inline void __cpu_set(int cpu, volatile cpumask_t *dstp)
+static inline void __cpu_set(int cpu, cpumask_t *dstp)
 {
 	set_bit(cpu, dstp->bits);
 }
 
 #define cpu_clear(cpu, dst) __cpu_clear((cpu), &(dst))
-static inline void __cpu_clear(int cpu, volatile cpumask_t *dstp)
+static inline void __cpu_clear(int cpu, cpumask_t *dstp)
 {
 	clear_bit(cpu, dstp->bits);
 }
Index: linux-2.6.16-mm2/include/linux/nodemask.h
===================================================================
--- linux-2.6.16-mm2.orig/include/linux/nodemask.h	2006-03-30 20:58:06.000000000 -0800
+++ linux-2.6.16-mm2/include/linux/nodemask.h	2006-03-30 20:29:46.000000000 -0800
@@ -89,13 +89,13 @@ typedef struct { DECLARE_BITMAP(bits, MA
 extern nodemask_t _unused_nodemask_arg_;
 
 #define node_set(node, dst) __node_set((node), &(dst))
-static inline void __node_set(int node, volatile nodemask_t *dstp)
+static inline void __node_set(int node, nodemask_t *dstp)
 {
 	set_bit(node, dstp->bits);
 }
 
 #define node_clear(node, dst) __node_clear((node), &(dst))
-static inline void __node_clear(int node, volatile nodemask_t *dstp)
+static inline void __node_clear(int node, nodemask_t *dstp)
 {
 	clear_bit(node, dstp->bits);
 }