diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-20 06:57:38 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-20 06:57:38 +0400 |
| commit | ffee72d4681c8777918268a96aef42bdeb6c367b (patch) | |
| tree | 4baf91483886d561c198ed0524ab54b783273e86 /arch/ia64/kernel/salinfo.c | |
| parent | fb54d268329846aa13b2bc44a64d90e9b7131192 (diff) | |
| parent | f72caf7e496465182eeda842ac66a5e75404ddf1 (diff) | |
| download | linux-ffee72d4681c8777918268a96aef42bdeb6c367b.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/salinfo.c')
| -rw-r--r-- | arch/ia64/kernel/salinfo.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c index e6676fca4828..aa8b5fa1a8de 100644 --- a/arch/ia64/kernel/salinfo.c +++ b/arch/ia64/kernel/salinfo.c @@ -404,10 +404,9 @@ static void call_on_cpu(int cpu, void (*fn)(void *), void *arg) { cpumask_t save_cpus_allowed = current->cpus_allowed; - cpumask_t new_cpus_allowed = cpumask_of_cpu(cpu); - set_cpus_allowed(current, new_cpus_allowed); + set_cpus_allowed_ptr(current, cpumask_of(cpu)); (*fn)(arg); - set_cpus_allowed(current, save_cpus_allowed); + set_cpus_allowed_ptr(current, &save_cpus_allowed); } static void |