From 27c74e306519df3ef530bcec7386e95c51993aff Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Fri, 25 Jul 2008 01:47:25 -0700 Subject: [PATCH] --- yaml --- r: 105917 b: refs/heads/master c: da5ef6bb96158b0fc0d808704237a453af449124 h: refs/heads/master i: 105915: 4f603adc68f8ebe58ecbad605d23a7e3da3ad9c9 v: v3 --- [refs] | 2 +- trunk/kernel/cpuset.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c1cb468df910..6bed0b3b4f8d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02412483777651a26b19a75e49c2a451a174ca9c +refs/heads/master: da5ef6bb96158b0fc0d808704237a453af449124 diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c index ebbc9b082e48..91cf85b36dd5 100644 --- a/trunk/kernel/cpuset.c +++ b/trunk/kernel/cpuset.c @@ -365,7 +365,7 @@ void cpuset_update_task_memory_state(void) my_cpusets_mem_gen = top_cpuset.mems_generation; } else { rcu_read_lock(); - my_cpusets_mem_gen = task_cs(current)->mems_generation; + my_cpusets_mem_gen = task_cs(tsk)->mems_generation; rcu_read_unlock(); } @@ -1777,7 +1777,7 @@ static void move_member_tasks_to_cpuset(struct cpuset *from, struct cpuset *to) scan.scan.heap = NULL; scan.to = to->css.cgroup; - if (cgroup_scan_tasks((struct cgroup_scanner *)&scan)) + if (cgroup_scan_tasks(&scan.scan)) printk(KERN_ERR "move_member_tasks_to_cpuset: " "cgroup_scan_tasks failed\n"); }