diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/cpuset.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 5a06fef669f8..f513dd937eee 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
@@ -54,7 +54,7 @@ | |||
54 | #include <asm/atomic.h> | 54 | #include <asm/atomic.h> |
55 | #include <asm/semaphore.h> | 55 | #include <asm/semaphore.h> |
56 | 56 | ||
57 | #define CPUSET_SUPER_MAGIC 0x27e0eb | 57 | #define CPUSET_SUPER_MAGIC 0x27e0eb |
58 | 58 | ||
59 | /* See "Frequency meter" comments, below. */ | 59 | /* See "Frequency meter" comments, below. */ |
60 | 60 | ||
@@ -154,9 +154,6 @@ static struct cpuset top_cpuset = { | |||
154 | .count = ATOMIC_INIT(0), | 154 | .count = ATOMIC_INIT(0), |
155 | .sibling = LIST_HEAD_INIT(top_cpuset.sibling), | 155 | .sibling = LIST_HEAD_INIT(top_cpuset.sibling), |
156 | .children = LIST_HEAD_INIT(top_cpuset.children), | 156 | .children = LIST_HEAD_INIT(top_cpuset.children), |
157 | .parent = NULL, | ||
158 | .dentry = NULL, | ||
159 | .mems_generation = 0, | ||
160 | }; | 157 | }; |
161 | 158 | ||
162 | static struct vfsmount *cpuset_mount; | 159 | static struct vfsmount *cpuset_mount; |
@@ -1341,7 +1338,7 @@ static int cpuset_create_file(struct dentry *dentry, int mode) | |||
1341 | 1338 | ||
1342 | /* | 1339 | /* |
1343 | * cpuset_create_dir - create a directory for an object. | 1340 | * cpuset_create_dir - create a directory for an object. |
1344 | * cs: the cpuset we create the directory for. | 1341 | * cs: the cpuset we create the directory for. |
1345 | * It must have a valid ->parent field | 1342 | * It must have a valid ->parent field |
1346 | * And we are going to fill its ->dentry field. | 1343 | * And we are going to fill its ->dentry field. |
1347 | * name: The name to give to the cpuset directory. Will be copied. | 1344 | * name: The name to give to the cpuset directory. Will be copied. |
@@ -2049,7 +2046,7 @@ done: | |||
2049 | * cpuset file 'memory_pressure_enabled' in the root cpuset. | 2046 | * cpuset file 'memory_pressure_enabled' in the root cpuset. |
2050 | */ | 2047 | */ |
2051 | 2048 | ||
2052 | int cpuset_memory_pressure_enabled; | 2049 | int cpuset_memory_pressure_enabled __read_mostly; |
2053 | 2050 | ||
2054 | /** | 2051 | /** |
2055 | * cpuset_memory_pressure_bump - keep stats of per-cpuset reclaims. | 2052 | * cpuset_memory_pressure_bump - keep stats of per-cpuset reclaims. |