diff --git a/[refs] b/[refs] index 4af7bd5897d6..e8152b259ab8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90c9cc4043fd8454d11886379f841f70e176698e +refs/heads/master: c5b2aff89635495064592dc90da595f8a880ee87 diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c index 5a06fef669f8..f513dd937eee 100644 --- a/trunk/kernel/cpuset.c +++ b/trunk/kernel/cpuset.c @@ -54,7 +54,7 @@ #include #include -#define CPUSET_SUPER_MAGIC 0x27e0eb +#define CPUSET_SUPER_MAGIC 0x27e0eb /* See "Frequency meter" comments, below. */ @@ -154,9 +154,6 @@ static struct cpuset top_cpuset = { .count = ATOMIC_INIT(0), .sibling = LIST_HEAD_INIT(top_cpuset.sibling), .children = LIST_HEAD_INIT(top_cpuset.children), - .parent = NULL, - .dentry = NULL, - .mems_generation = 0, }; static struct vfsmount *cpuset_mount; @@ -1341,7 +1338,7 @@ static int cpuset_create_file(struct dentry *dentry, int mode) /* * cpuset_create_dir - create a directory for an object. - * cs: the cpuset we create the directory for. + * cs: the cpuset we create the directory for. * It must have a valid ->parent field * And we are going to fill its ->dentry field. * name: The name to give to the cpuset directory. Will be copied. @@ -2049,7 +2046,7 @@ int cpuset_excl_nodes_overlap(const struct task_struct *p) * cpuset file 'memory_pressure_enabled' in the root cpuset. */ -int cpuset_memory_pressure_enabled; +int cpuset_memory_pressure_enabled __read_mostly; /** * cpuset_memory_pressure_bump - keep stats of per-cpuset reclaims.