summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorRakib Mullick <rakib.mullick@gmail.com>2009-01-06 14:40:38 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-06 15:59:10 -0800
commitf99ebf0a86de13f77bc4ee349de96db9f2f67f2e (patch)
tree1f286cd9cd4d69638b4b3cc5d2ed48a6e566ce98 /init
parent91f47662dfaa5b459aebe13284c6c38db27350dc (diff)
downloadlinux-f99ebf0a86de13f77bc4ee349de96db9f2f67f2e.tar.gz
linux-f99ebf0a86de13f77bc4ee349de96db9f2f67f2e.tar.bz2
linux-f99ebf0a86de13f77bc4ee349de96db9f2f67f2e.zip
init: properly placing noinline keyword
checkpatch warns about 'static void noinline'. It wants `static noinline void'. Both are permissible, but the kernel consistently uses `static inline' and `static noinline', and consistency is good. Hence let's keep the checkpatch warning and fix up this code site. [akpm@linux-foundation.org: rewrote changelog] Signed-off-by: Md.Rakib H. Mullick <rakib.mullick@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c
index cd168ebc5924..90926dadc20d 100644
--- a/init/main.c
+++ b/init/main.c
@@ -447,7 +447,7 @@ static void __init setup_command_line(char *command_line)
* gcc-3.4 accidentally inlines this function, so use noinline.
*/
-static void noinline __init_refok rest_init(void)
+static noinline void __init_refok rest_init(void)
__releases(kernel_lock)
{
int pid;
@@ -786,7 +786,7 @@ static void run_init_process(char *init_filename)
/* This is a non __init function. Force it to be noinline otherwise gcc
* makes it inline to init() and it becomes part of init.text section
*/
-static int noinline init_post(void)
+static noinline int init_post(void)
{
free_initmem();
unlock_kernel();