summaryrefslogtreecommitdiff
path: root/kernel/taskstats.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-16 12:24:38 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-16 12:24:38 +0100
commitc3895b01e80d120e8d19435f7cb1fa4c60c4e269 (patch)
tree426f36e999289eeb7a41f6f4ca8ff45bfc2372aa /kernel/taskstats.c
parent3c68b4a8071fb11d905570d9b0e23034adc6c2bb (diff)
parent968ea6d80e395cf11a51143cfa1b9a14ada676df (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-ingo into cpus4096
Diffstat (limited to 'kernel/taskstats.c')
-rw-r--r--kernel/taskstats.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/taskstats.c b/kernel/taskstats.c
index bd6be76303cf..6d7dc4ec4aa5 100644
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
@@ -352,7 +352,7 @@ static int parse(struct nlattr *na, cpumask_t *mask)
if (!data)
return -ENOMEM;
nla_strlcpy(data, na, len);
- ret = cpulist_parse(data, *mask);
+ ret = cpulist_parse(data, mask);
kfree(data);
return ret;
}