diff options
authorVineet Gupta <Vineet.Gupta1@synopsys.com>2012-12-21 12:25:44 +0530
committerAl Viro <viro@zeniv.linux.org.uk>2012-12-26 01:14:12 -0500
commitf80b0c904da93b9ad7db2fd9823dd701932df779 (patch)
parenta49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff)
Ensure that kernel_init_freeable() is not inlined into non __init code
Commit d6b2123802d "make sure that we always have a return path from kernel_execve()" reshuffled kernel_init()/init_post() to ensure that kernel_execve() has a caller to return to. It removed __init annotation for kernel_init() and introduced/calls a new routine kernel_init_freeable(). Latter however is inlined by any reasonable compiler (ARC gcc 4.4 in this case), causing slight code bloat. This patch forces kernel_init_freeable() as noinline reducing the .text bloat-o-meter vmlinux vmlinux_new add/remove: 1/0 grow/shrink: 0/1 up/down: 374/-334 (40) function old new delta kernel_init_freeable - 374 +374 (.init.text) kernel_init 628 294 -334 (.text) Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 files changed, 2 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c
index 85d69dffe86..92d728a32d5 100644
--- a/init/main.c
+++ b/init/main.c
@@ -802,7 +802,7 @@ static int run_init_process(const char *init_filename)
(const char __user *const __user *)envp_init);
-static void __init kernel_init_freeable(void);
+static noinline void __init kernel_init_freeable(void);
static int __ref kernel_init(void *unused)
@@ -845,7 +845,7 @@ static int __ref kernel_init(void *unused)
"See Linux Documentation/init.txt for guidance.");
-static void __init kernel_init_freeable(void)
+static noinline void __init kernel_init_freeable(void)
* Wait until kthreadd is all set-up.