projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
[deliverable/linux.git]
/
kernel
/
cpuset.c
diff --git
a/kernel/cpuset.c
b/kernel/cpuset.c
index 00ab5c2b7c5b9df67dfd57f0b91b16bf3bd80960..1902956baba1fa19d915c2ccad402a64209b4860 100644
(file)
--- a/
kernel/cpuset.c
+++ b/
kernel/cpuset.c
@@
-58,7
+58,6
@@
#include <asm/uaccess.h>
#include <linux/atomic.h>
#include <linux/mutex.h>
#include <asm/uaccess.h>
#include <linux/atomic.h>
#include <linux/mutex.h>
-#include <linux/workqueue.h>
#include <linux/cgroup.h>
#include <linux/wait.h>
#include <linux/cgroup.h>
#include <linux/wait.h>
@@
-1016,7
+1015,7
@@
static void cpuset_migrate_mm(struct mm_struct *mm, const nodemask_t *from,
}
}
}
}
-
void cpuset_post_attach_flus
h(void)
+
static void cpuset_post_attac
h(void)
{
flush_workqueue(cpuset_migrate_mm_wq);
}
{
flush_workqueue(cpuset_migrate_mm_wq);
}
@@
-2087,6
+2086,7
@@
struct cgroup_subsys cpuset_cgrp_subsys = {
.can_attach = cpuset_can_attach,
.cancel_attach = cpuset_cancel_attach,
.attach = cpuset_attach,
.can_attach = cpuset_can_attach,
.cancel_attach = cpuset_cancel_attach,
.attach = cpuset_attach,
+ .post_attach = cpuset_post_attach,
.bind = cpuset_bind,
.legacy_cftypes = files,
.early_init = true,
.bind = cpuset_bind,
.legacy_cftypes = files,
.early_init = true,
This page took
0.04947 seconds
and
5
git commands to generate.