diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 17:06:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 17:06:54 -0700 |
| commit | 78417334b5cb6e1f915b8fdcc4fce3f1a1b4420c (patch) | |
| tree | 8e3fce9f27fd058904c0a3247a5c5ebb8df9fbe8 /init | |
| parent | cd816a0d84377c4e87f55cbe934a23417f9f5743 (diff) | |
| parent | 5f202bd5ca64132cdd7f186656bc0221f257733d (diff) | |
| download | linux-78417334b5cb6e1f915b8fdcc4fce3f1a1b4420c.tar.bz2 | |
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.c | 5 |
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) kthreadd_task = find_task_by_pid_ns(pid, &init_pid_ns); rcu_read_unlock(); complete(&kthreadd_done); - unlock_kernel(); /* * The boot idle thread must execute schedule() @@ -563,7 +562,6 @@ asmlinkage void __init start_kernel(void) * Interrupts are still disabled. Do necessary setups, then * enable them */ - lock_kernel(); tick_init(); boot_cpu_init(); page_address_init(); @@ -820,7 +818,6 @@ static noinline int init_post(void) /* need to finish all async __init code before freeing the memory */ async_synchronize_full(); free_initmem(); - unlock_kernel(); mark_rodata_ro(); system_state = SYSTEM_RUNNING; numa_default_policy(); @@ -860,8 +857,6 @@ static int __init kernel_init(void * unused) * Wait until kthreadd is all set-up. */ wait_for_completion(&kthreadd_done); - lock_kernel(); - /* * init can allocate pages on any node */ |