1 files changed, 3 insertions, 3 deletions

diff --git a/init/main.c b/init/main.c
index b0097d2b63ae..3585f073d636 100644
--- a/init/main.c
+++ b/init/main.c
@@ -408,8 +408,7 @@ static void __init smp_init(void)
          * Set up the current CPU as possible to migrate to.
          * The other ones will be done by cpu_up/cpu_down()
          */
-        cpu = smp_processor_id();
-        cpu_set(cpu, cpu_active_map);
+        set_cpu_active(smp_processor_id(), true);
 
         /* FIXME: This should be done in userspace --RR */
         for_each_present_cpu(cpu) {
@@ -797,6 +796,7 @@ static void run_init_process(char *init_filename)
  * makes it inline to init() and it becomes part of init.text section
  */
 static noinline int init_post(void)
+        __releases(kernel_lock)
 {
         /* need to finish all async __init code before freeing the memory */
         async_synchronize_full();
@@ -845,7 +845,7 @@ static int __init kernel_init(void * unused)
         /*
          * init can run on any cpu.
          */
-        set_cpus_allowed_ptr(current, CPU_MASK_ALL_PTR);
+        set_cpus_allowed_ptr(current, cpu_all_mask);
         /*
          * Tell the world that we're going to be the grim
          * reaper of innocent orphaned children.