[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20090129094445.67fab3e4.akpm@linux-foundation.org>
Date: Thu, 29 Jan 2009 09:44:45 -0800
From: Andrew Morton <akpm@...ux-foundation.org>
To: Valdis.Kletnieks@...edu
Cc: Miao Xie <miaox@...fujitsu.com>, linux-kernel@...r.kernel.org
Subject: Re: mmotm 2009-01-28-02-17 uploaded
On Wed, 28 Jan 2009 22:43:24 -0500 Valdis.Kletnieks@...edu wrote:
> On Wed, 28 Jan 2009 02:19:09 PST, akpm@...ux-foundation.org said:
> > The mm-of-the-moment snapshot 2009-01-28-02-17 has been uploaded to
> >
> > http://userweb.kernel.org/~akpm/mmotm/
>
> cpuset-fix-allocating-page-cache-slab-object-on-the-unallowed-node-when-memory-spread-is-set.patch
>
> breaks compiles with CONFIG_CPUSETS=n
>
> CC init/main.o
> init/main.c: In function 'kernel_init':
> init/main.c:876: error: 'struct task_struct' has no member named 'mems_allowed'
> make[1]: *** [init/main.o] Error 1
>
> Looks like it adds a reference to task->mems_allowed to kernel/main.c
> and kernel/kthreads.c and neither one is wrapped with #ifdef CONFIG_CPUSETS
> or anything.
>
yup. mmotm-2009-01-29-02-29 has
diff -puN include/linux/cpuset.h~cpuset-fix-allocating-page-cache-slab-object-on-the-unallowed-node-when-memory-spread-is-set-fix-2 include/linux/cpuset.h
--- a/include/linux/cpuset.h~cpuset-fix-allocating-page-cache-slab-object-on-the-unallowed-node-when-memory-spread-is-set-fix-2
+++ a/include/linux/cpuset.h
@@ -79,6 +79,11 @@ extern void rebuild_sched_domains(void);
extern void cpuset_print_task_mems_allowed(struct task_struct *p);
+static inline void set_mems_allowed(nodemask_t nodemask)
+{
+ current->mems_allowed = nodemask;
+}
+
#else /* !CONFIG_CPUSETS */
static inline int cpuset_init(void) { return 0; }
@@ -163,6 +168,10 @@ static inline void cpuset_print_task_mem
{
}
+static inline void set_mems_allowed(nodemask_t nodemask)
+{
+}
+
#endif /* !CONFIG_CPUSETS */
#endif /* _LINUX_CPUSET_H */
diff -puN init/main.c~cpuset-fix-allocating-page-cache-slab-object-on-the-unallowed-node-when-memory-spread-is-set-fix-2 init/main.c
--- a/init/main.c~cpuset-fix-allocating-page-cache-slab-object-on-the-unallowed-node-when-memory-spread-is-set-fix-2
+++ a/init/main.c
@@ -873,7 +873,7 @@ static int __init kernel_init(void * unu
*/
init_pid_ns.child_reaper = current;
- current->mems_allowed = node_possible_map;
+ set_mems_allowed(node_possible_map);
cad_pid = task_pid(current);
diff -puN kernel/kthread.c~cpuset-fix-allocating-page-cache-slab-object-on-the-unallowed-node-when-memory-spread-is-set-fix-2 kernel/kthread.c
--- a/kernel/kthread.c~cpuset-fix-allocating-page-cache-slab-object-on-the-unallowed-node-when-memory-spread-is-set-fix-2
+++ a/kernel/kthread.c
@@ -13,6 +13,8 @@
#include <linux/file.h>
#include <linux/module.h>
#include <linux/mutex.h>
+#include <linux/cpuset.h>
+
#include <trace/sched.h>
#define KTHREAD_NICE_LEVEL (-5)
@@ -242,7 +244,7 @@ int kthreadd(void *unused)
set_user_nice(tsk, KTHREAD_NICE_LEVEL);
set_cpus_allowed_ptr(tsk, CPU_MASK_ALL_PTR);
- current->mems_allowed = node_possible_map;
+ set_mems_allowed(node_possible_map);
current->flags |= PF_NOFREEZE | PF_FREEZER_NOSIG;
for (;;) {
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists