diff options
author | Rakib Mullick <rakib.mullick@gmail.com> | 2009-01-06 17:40:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 18:59:10 -0500 |
commit | f99ebf0a86de13f77bc4ee349de96db9f2f67f2e (patch) | |
tree | 1f286cd9cd4d69638b4b3cc5d2ed48a6e566ce98 | |
parent | 91f47662dfaa5b459aebe13284c6c38db27350dc (diff) |
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>
-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 cd168ebc5924..90926dadc20d 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -447,7 +447,7 @@ static void __init setup_command_line(char *command_line) | |||
447 | * gcc-3.4 accidentally inlines this function, so use noinline. | 447 | * gcc-3.4 accidentally inlines this function, so use noinline. |
448 | */ | 448 | */ |
449 | 449 | ||
450 | static void noinline __init_refok rest_init(void) | 450 | static noinline void __init_refok rest_init(void) |
451 | __releases(kernel_lock) | 451 | __releases(kernel_lock) |
452 | { | 452 | { |
453 | int pid; | 453 | int pid; |
@@ -786,7 +786,7 @@ static void run_init_process(char *init_filename) | |||
786 | /* This is a non __init function. Force it to be noinline otherwise gcc | 786 | /* This is a non __init function. Force it to be noinline otherwise gcc |
787 | * makes it inline to init() and it becomes part of init.text section | 787 | * makes it inline to init() and it becomes part of init.text section |
788 | */ | 788 | */ |
789 | static int noinline init_post(void) | 789 | static noinline int init_post(void) |
790 | { | 790 | { |
791 | free_initmem(); | 791 | free_initmem(); |
792 | unlock_kernel(); | 792 | unlock_kernel(); |