Merge remote-tracking branch 'torvalds/master' into perf/core

[linux-2.6-microblaze.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index eb01e12..e9c42a1 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -1537,7 +1537,7 @@ static noinline void __init kernel_init_freeable(void)
         */
        set_mems_allowed(node_states[N_MEMORY]);
 
-       cad_pid = task_pid(current);
+       cad_pid = get_pid(task_pid(current));
 
        smp_prepare_cpus(setup_max_cpus);