diff --git a/[refs] b/[refs]
index c395f07db674..99b28e9390b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b52402c783d8c16b11f146a244bb21086a94bf84
+refs/heads/master: 9a8488965dc4c42a4a1f84cab907c7d6c5cf1563
diff --git a/trunk/include/linux/cpuset.h b/trunk/include/linux/cpuset.h
index 2d9a500d994d..3438233305a3 100644
--- a/trunk/include/linux/cpuset.h
+++ b/trunk/include/linux/cpuset.h
@@ -18,7 +18,7 @@ extern int cpuset_init(void);
 extern void cpuset_init_smp(void);
 extern void cpuset_fork(struct task_struct *p);
 extern void cpuset_exit(struct task_struct *p);
-extern const cpumask_t cpuset_cpus_allowed(const struct task_struct *p);
+extern cpumask_t cpuset_cpus_allowed(const struct task_struct *p);
 void cpuset_init_current_mems_allowed(void);
 void cpuset_update_current_mems_allowed(void);
 void cpuset_restrict_to_mems_allowed(unsigned long *nodes);
diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c
index 69792bbe2281..961d74044deb 100644
--- a/trunk/kernel/cpuset.c
+++ b/trunk/kernel/cpuset.c
@@ -1432,7 +1432,7 @@ void cpuset_exit(struct task_struct *tsk)
  * tasks cpuset.
  **/
 
-const cpumask_t cpuset_cpus_allowed(const struct task_struct *tsk)
+cpumask_t cpuset_cpus_allowed(const struct task_struct *tsk)
 {
 	cpumask_t mask;