From 0711433e812dbb766918667b6d7f5e3ba6937ddd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 21 Jan 2013 12:13:59 -0800 Subject: [PATCH] 3.7-stable patches added patches: ensure-that-kernel_init_freeable-is-not-inlined-into-non-__init-code.patch --- ...-is-not-inlined-into-non-__init-code.patch | 53 +++++++++++++++++++ queue-3.7/series | 1 + 2 files changed, 54 insertions(+) create mode 100644 queue-3.7/ensure-that-kernel_init_freeable-is-not-inlined-into-non-__init-code.patch diff --git a/queue-3.7/ensure-that-kernel_init_freeable-is-not-inlined-into-non-__init-code.patch b/queue-3.7/ensure-that-kernel_init_freeable-is-not-inlined-into-non-__init-code.patch new file mode 100644 index 00000000000..d19829dc4ce --- /dev/null +++ b/queue-3.7/ensure-that-kernel_init_freeable-is-not-inlined-into-non-__init-code.patch @@ -0,0 +1,53 @@ +From f80b0c904da93b9ad7db2fd9823dd701932df779 Mon Sep 17 00:00:00 2001 +From: Vineet Gupta +Date: Fri, 21 Dec 2012 12:25:44 +0530 +Subject: Ensure that kernel_init_freeable() is not inlined into non __init code + +From: Vineet Gupta + +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 +Signed-off-by: Greg Kroah-Hartman + +--- + init/main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/init/main.c ++++ b/init/main.c +@@ -800,7 +800,7 @@ static int run_init_process(const char * + 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 *unuse + "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. diff --git a/queue-3.7/series b/queue-3.7/series index 6415363a074..9df3fc62397 100644 --- a/queue-3.7/series +++ b/queue-3.7/series @@ -1 +1,2 @@ make-sure-that-linuxrc-has-std-in-out-err.patch +ensure-that-kernel_init_freeable-is-not-inlined-into-non-__init-code.patch -- 2.47.3