diff options
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c index 80f09f31bfab..df982ff5d2b0 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -82,7 +82,7 @@ | |||
82 | #warning gcc-4.1.0 is known to miscompile the kernel. A different compiler version is recommended. | 82 | #warning gcc-4.1.0 is known to miscompile the kernel. A different compiler version is recommended. |
83 | #endif | 83 | #endif |
84 | 84 | ||
85 | static int init(void *); | 85 | static int kernel_init(void *); |
86 | 86 | ||
87 | extern void init_IRQ(void); | 87 | extern void init_IRQ(void); |
88 | extern void fork_init(unsigned long); | 88 | extern void fork_init(unsigned long); |
@@ -431,7 +431,7 @@ static void __init setup_command_line(char *command_line) | |||
431 | static void noinline rest_init(void) | 431 | static void noinline rest_init(void) |
432 | __releases(kernel_lock) | 432 | __releases(kernel_lock) |
433 | { | 433 | { |
434 | kernel_thread(init, NULL, CLONE_FS | CLONE_SIGHAND); | 434 | kernel_thread(kernel_init, NULL, CLONE_FS | CLONE_SIGHAND); |
435 | numa_default_policy(); | 435 | numa_default_policy(); |
436 | unlock_kernel(); | 436 | unlock_kernel(); |
437 | 437 | ||
@@ -768,7 +768,7 @@ static int noinline init_post(void) | |||
768 | panic("No init found. Try passing init= option to kernel."); | 768 | panic("No init found. Try passing init= option to kernel."); |
769 | } | 769 | } |
770 | 770 | ||
771 | static int __init init(void * unused) | 771 | static int __init kernel_init(void * unused) |
772 | { | 772 | { |
773 | lock_kernel(); | 773 | lock_kernel(); |
774 | /* | 774 | /* |