diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 15:04:50 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 15:04:50 +1100 |
commit | 93e2e1f2a2c9dd71c18d14c613e6da3faa9fbed3 (patch) | |
tree | bd096500e606690ba626320431db58cf521f33e7 /kernel/cpuset.c | |
parent | 1ee54f4fed2b52863bc5e0002160e4fd96b73205 (diff) | |
parent | fcc20d943c54c4fc31b97501b8f7e69aa3676f60 (diff) |
Merge branch 'quilt/rr'
Conflicts:
arch/x86/kernel/io_apic.c
arch/x86/kernel/setup.c
kernel/irq/manage.c
kernel/irq/proc.c
Diffstat (limited to 'kernel/cpuset.c')
-rw-r--r-- | kernel/cpuset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 96c0ba13b8cd..39c1a4c1c5a9 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -896,7 +896,7 @@ static int update_cpumask(struct cpuset *cs, const char *buf) if (!*buf) { cpus_clear(trialcs.cpus_allowed); } else { - retval = cpulist_parse(buf, trialcs.cpus_allowed); + retval = cpulist_parse(buf, &trialcs.cpus_allowed); if (retval < 0) return retval; @@ -1482,7 +1482,7 @@ static int cpuset_sprintf_cpulist(char *page, struct cpuset *cs) mask = cs->cpus_allowed; mutex_unlock(&callback_mutex); - return cpulist_scnprintf(page, PAGE_SIZE, mask); + return cpulist_scnprintf(page, PAGE_SIZE, &mask); } static int cpuset_sprintf_memlist(char *page, struct cpuset *cs) |