Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211

[linux-2.6] / kernel / cpuset.c

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 69792bbe22817b6289fc20d1669e1402ab36395e..961d74044deb0b08f8ce237e4f86c700da5e768a 100644 (file)
--- a/kernel/cpuset.c
+++ b/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;