summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2007-02-26 16:45:41 +0100
committerSam Ravnborg <sam@ravnborg.org>2007-05-02 20:58:07 +0200
commitaae5f662a32c35b1a962627535acb588d48ff5f9 (patch)
tree6e300ed8557e850e350c95dffb57ff9d5d5b182d /init
parentkbuild: fix section mismatch check for vmlinux (diff)
downloadlinux-aae5f662a32c35b1a962627535acb588d48ff5f9.tar.xz
linux-aae5f662a32c35b1a962627535acb588d48ff5f9.zip
kbuild: whitelist section mismatch in init/main.c
In init/main.c we have a reference from rest_init() to .init.text which is intentional. Rename the function 'init' to 'kernel_init' to make it a kernel wide unique symbol and whitelist the reference. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'init')
-rw-r--r--init/main.c6
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 @@
#warning gcc-4.1.0 is known to miscompile the kernel. A different compiler version is recommended.
#endif
-static int init(void *);
+static int kernel_init(void *);
extern void init_IRQ(void);
extern void fork_init(unsigned long);
@@ -435,7 +435,7 @@ static void __init setup_command_line(char *command_line)
static void noinline rest_init(void)
__releases(kernel_lock)
{
- kernel_thread(init, NULL, CLONE_FS | CLONE_SIGHAND);
+ kernel_thread(kernel_init, NULL, CLONE_FS | CLONE_SIGHAND);
numa_default_policy();
unlock_kernel();
@@ -772,7 +772,7 @@ static int noinline init_post(void)
panic("No init found. Try passing init= option to kernel.");
}
-static int __init init(void * unused)
+static int __init kernel_init(void * unused)
{
lock_kernel();
/*