aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-07 20:06:54 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-07 20:06:54 -0400
commit78417334b5cb6e1f915b8fdcc4fce3f1a1b4420c (patch)
tree8e3fce9f27fd058904c0a3247a5c5ebb8df9fbe8 /init
parentcd816a0d84377c4e87f55cbe934a23417f9f5743 (diff)
parent5f202bd5ca64132cdd7f186656bc0221f257733d (diff)
Merge branch 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing
* 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing: do_coredump: Do not take BKL init: Remove the BKL from startup code
Diffstat (limited to 'init')
-rw-r--r--init/main.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/init/main.c b/init/main.c
index e97fadeec856..b8b6effe9ff4 100644
--- a/init/main.c
+++ b/init/main.c
@@ -441,7 +441,6 @@ static noinline void __init_refok rest_init(void)
441 kthreadd_task = find_task_by_pid_ns(pid, &init_pid_ns); 441 kthreadd_task = find_task_by_pid_ns(pid, &init_pid_ns);
442 rcu_read_unlock(); 442 rcu_read_unlock();
443 complete(&kthreadd_done); 443 complete(&kthreadd_done);
444 unlock_kernel();
445 444
446 /* 445 /*
447 * The boot idle thread must execute schedule() 446 * The boot idle thread must execute schedule()
@@ -563,7 +562,6 @@ asmlinkage void __init start_kernel(void)
563 * Interrupts are still disabled. Do necessary setups, then 562 * Interrupts are still disabled. Do necessary setups, then
564 * enable them 563 * enable them
565 */ 564 */
566 lock_kernel();
567 tick_init(); 565 tick_init();
568 boot_cpu_init(); 566 boot_cpu_init();
569 page_address_init(); 567 page_address_init();
@@ -820,7 +818,6 @@ static noinline int init_post(void)
820 /* need to finish all async __init code before freeing the memory */ 818 /* need to finish all async __init code before freeing the memory */
821 async_synchronize_full(); 819 async_synchronize_full();
822 free_initmem(); 820 free_initmem();
823 unlock_kernel();
824 mark_rodata_ro(); 821 mark_rodata_ro();
825 system_state = SYSTEM_RUNNING; 822 system_state = SYSTEM_RUNNING;
826 numa_default_policy(); 823 numa_default_policy();
@@ -860,8 +857,6 @@ static int __init kernel_init(void * unused)
860 * Wait until kthreadd is all set-up. 857 * Wait until kthreadd is all set-up.
861 */ 858 */
862 wait_for_completion(&kthreadd_done); 859 wait_for_completion(&kthreadd_done);
863 lock_kernel();
864
865 /* 860 /*
866 * init can allocate pages on any node 861 * init can allocate pages on any node
867 */ 862 */