projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[linux-2.6-block.git]
/
kernel
/
cpuset.c
diff --git
a/kernel/cpuset.c
b/kernel/cpuset.c
index 026faccca869e396d378693422e29e9c82f739ac..d5a7e17474ee354259e71878156b6ea82ac8a6a2 100644
(file)
--- a/
kernel/cpuset.c
+++ b/
kernel/cpuset.c
@@
-1857,7
+1857,7
@@
struct cgroup_subsys cpuset_subsys = {
int __init cpuset_init_early(void)
{
- alloc_
bootmem_cpumask_var(&top_cpuset.cpus_allowed
);
+ alloc_
cpumask_var(&top_cpuset.cpus_allowed, GFP_NOWAIT
);
top_cpuset.mems_generation = cpuset_mems_generation++;
return 0;