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 a92989e7836a..7a92b4ca3aad 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); |
@@ -435,7 +435,7 @@ static void __init setup_command_line(char *command_line) | |||
435 | static void noinline rest_init(void) | 435 | static void noinline rest_init(void) |
436 | __releases(kernel_lock) | 436 | __releases(kernel_lock) |
437 | { | 437 | { |
438 | kernel_thread(init, NULL, CLONE_FS | CLONE_SIGHAND); | 438 | kernel_thread(kernel_init, NULL, CLONE_FS | CLONE_SIGHAND); |
439 | numa_default_policy(); | 439 | numa_default_policy(); |
440 | unlock_kernel(); | 440 | unlock_kernel(); |
441 | 441 | ||
@@ -772,7 +772,7 @@ static int noinline init_post(void) | |||
772 | panic("No init found. Try passing init= option to kernel."); | 772 | panic("No init found. Try passing init= option to kernel."); |
773 | } | 773 | } |
774 | 774 | ||
775 | static int __init init(void * unused) | 775 | static int __init kernel_init(void * unused) |
776 | { | 776 | { |
777 | lock_kernel(); | 777 | lock_kernel(); |
778 | /* | 778 | /* |