diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /arch/sparc/kernel/sysfs.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'arch/sparc/kernel/sysfs.c')
| -rw-r--r-- | arch/sparc/kernel/sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/sysfs.c b/arch/sparc/kernel/sysfs.c index ca39c606fe8e..1eb8b00aed75 100644 --- a/arch/sparc/kernel/sysfs.c +++ b/arch/sparc/kernel/sysfs.c | |||
| @@ -107,12 +107,12 @@ static unsigned long run_on_cpu(unsigned long cpu, | |||
| 107 | unsigned long ret; | 107 | unsigned long ret; |
| 108 | 108 | ||
| 109 | /* should return -EINVAL to userspace */ | 109 | /* should return -EINVAL to userspace */ |
| 110 | if (set_cpus_allowed(current, cpumask_of_cpu(cpu))) | 110 | if (set_cpus_allowed_ptr(current, cpumask_of(cpu))) |
| 111 | return 0; | 111 | return 0; |
| 112 | 112 | ||
| 113 | ret = func(arg); | 113 | ret = func(arg); |
| 114 | 114 | ||
| 115 | set_cpus_allowed(current, old_affinity); | 115 | set_cpus_allowed_ptr(current, &old_affinity); |
| 116 | 116 | ||
| 117 | return ret; | 117 | return ret; |
| 118 | } | 118 | } |