From: Siddha, Suresh B <suresh.b.siddha@intel.com>
Date: Tue, 8 May 2007 16:22:47 +0000 (-0700)
Subject: [IA64] save and restore cpus_allowed in cpu_idle_wait
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bb8416bf8b93d88e23cbbfde962ef85acda5bd5f;p=deliverable%2Flinux.git

[IA64] save and restore cpus_allowed in cpu_idle_wait

Save and Restore the task's cpus_allowed mask, across the set_cpus_allowed()
in cpu_idle_wait(). Without this, we will endup corrupting task's cpu affinity.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index ae96d4176995..cba6ac398736 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -237,6 +237,7 @@ void cpu_idle_wait(void)
 {
 	unsigned int cpu, this_cpu = get_cpu();
 	cpumask_t map;
+	cpumask_t tmp = current->cpus_allowed;
 
 	set_cpus_allowed(current, cpumask_of_cpu(this_cpu));
 	put_cpu();
@@ -258,6 +259,7 @@ void cpu_idle_wait(void)
 		}
 		cpus_and(map, map, cpu_online_map);
 	} while (!cpus_empty(map));
+	set_cpus_allowed(current, tmp);
 }
 EXPORT_SYMBOL_GPL(cpu_idle_wait);