Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / init / init_task.c

diff --git a/init/init_task.c b/init/init_task.c
index 5aebe3be4d7cd65ce1bed995c76b9293fea00b2d..df0257c5928c17f31823ebf9bf4eee7e287ff383 100644 (file)
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -10,6 +10,7 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/audit.h>
+#include <linux/numa.h>
 
 #include <asm/pgtable.h>
 #include <linux/uaccess.h>
@@ -44,7 +45,7 @@ static struct signal_struct init_signals = {
 };
 
 static struct sighand_struct init_sighand = {
-       .count          = ATOMIC_INIT(1),
+       .count          = REFCOUNT_INIT(1),
        .action         = { { { .sa_handler = SIG_DFL, } }, },
        .siglock        = __SPIN_LOCK_UNLOCKED(init_sighand.siglock),
        .signalfd_wqh   = __WAIT_QUEUE_HEAD_INITIALIZER(init_sighand.signalfd_wqh),
@@ -61,11 +62,11 @@ struct task_struct init_task
 = {
 #ifdef CONFIG_THREAD_INFO_IN_TASK
        .thread_info    = INIT_THREAD_INFO(init_task),
-       .stack_refcount = ATOMIC_INIT(1),
+       .stack_refcount = REFCOUNT_INIT(1),
 #endif
        .state          = 0,
        .stack          = init_stack,
-       .usage          = ATOMIC_INIT(2),
+       .usage          = REFCOUNT_INIT(2),
        .flags          = PF_KTHREAD,
        .prio           = MAX_PRIO - 20,
        .static_prio    = MAX_PRIO - 20,
@@ -154,7 +155,7 @@ struct task_struct init_task
        .vtime.state    = VTIME_SYS,
 #endif
 #ifdef CONFIG_NUMA_BALANCING
-       .numa_preferred_nid = -1,
+       .numa_preferred_nid = NUMA_NO_NODE,
        .numa_group     = NULL,
        .numa_faults    = NULL,
 #endif