diff options
| author | Vineet Gupta <Vineet.Gupta1@synopsys.com> | 2012-12-21 12:25:44 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-27 20:48:59 -0800 |
| commit | 8d6f01346caa705631292c41efb5924e1e677dd4 (patch) | |
| tree | 5d7a5f27f086836602a89c1806ae78198d6a71fb | |
| parent | f0de17c0babe7f29381892def6b37e9181a53410 (diff) | |
Ensure that kernel_init_freeable() is not inlined into non __init code
commit f80b0c904da93b9ad7db2fd9823dd701932df779 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | init/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index e33e09df3cbc..cd147a918786 100644 --- a/init/main.c +++ b/init/main.c @@ -800,7 +800,7 @@ static int run_init_process(const char *init_filename) return kernel_execve(init_filename, argv_init, envp_init); } -static void __init kernel_init_freeable(void); +static noinline void __init kernel_init_freeable(void); static int __ref kernel_init(void *unused) { @@ -844,7 +844,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. |