diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 15:03:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 15:03:04 -0400 |
commit | 080e89270a7bfb7d01fac9a67050f8ac6d6cdd11 (patch) | |
tree | 489e467292ca06420e85f185095323efb80c75b7 /init/main.c | |
parent | 4b85df0419d1fb135d9d845876e8c7ee1393f83c (diff) | |
parent | 38bdc32af442b6ab09ed61b8b669072098c95dd2 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix:
mm/slab: fix section mismatch warning
mm: fix section mismatch warnings
init/main: use __init_refok to fix section mismatch
kbuild: introduce __init_refok/__initdata_refok to supress section mismatch warnings
all-archs: consolidate .data section definition in asm-generic
all-archs: consolidate .text section definition in asm-generic
kbuild: add "Section mismatch" warning whitelist for powerpc
kbuild: make better section mismatch reports on i386, arm and mips
kbuild: make modpost section warnings clearer
kconfig: search harder for curses library in check-lxdialog.sh
kbuild: include limits.h in sumversion.c for PATH_MAX
powerpc: Fix the MODALIAS generation in modpost for of devices
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 1940fa75e82e..eb8bdbae4fc7 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -423,7 +423,7 @@ static void __init setup_command_line(char *command_line) | |||
423 | * gcc-3.4 accidentally inlines this function, so use noinline. | 423 | * gcc-3.4 accidentally inlines this function, so use noinline. |
424 | */ | 424 | */ |
425 | 425 | ||
426 | static void noinline rest_init(void) | 426 | static void noinline __init_refok rest_init(void) |
427 | __releases(kernel_lock) | 427 | __releases(kernel_lock) |
428 | { | 428 | { |
429 | int pid; | 429 | int pid; |