diff options
author | Vivek Goyal <vgoyal@in.ibm.com> | 2007-01-11 01:52:44 +0100 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2007-01-11 01:52:44 +0100 |
commit | 88d20328cd66ee05f9b7f4d414640700db69d82b (patch) | |
tree | 07c4f8c8593acf36e3e1687a861f97cc3eff6c34 | |
parent | 0e0be25d31f75f64b6fbe00f0b4e5d6b1ad1438e (diff) | |
download | blackbird-op-linux-88d20328cd66ee05f9b7f4d414640700db69d82b.tar.gz blackbird-op-linux-88d20328cd66ee05f9b7f4d414640700db69d82b.zip |
[PATCH] i386: Convert some functions to __init to avoid MODPOST warnings
o Some functions which should have been in init sections as they are called
only once. Put them in init sections. Otherwise MODPOST generates warning
as these functions are placed in .text and they end up accessing something
in init sections.
WARNING: vmlinux - Section mismatch: reference to .init.text:migration_init
from .text between 'do_pre_smp_initcalls' (at offset 0xc01000d1) and
'run_init_process'
Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Andi Kleen <ak@suse.de>
-rw-r--r-- | arch/i386/kernel/setup.c | 2 | ||||
-rw-r--r-- | init/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index 1df506d8d0cf..4b31ad70c1ac 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c @@ -495,7 +495,7 @@ static void set_mca_bus(int x) { } #endif /* Overridden in paravirt.c if CONFIG_PARAVIRT */ -char * __attribute__((weak)) memory_setup(void) +char * __init __attribute__((weak)) memory_setup(void) { return machine_specific_memory_setup(); } diff --git a/init/main.c b/init/main.c index d908d3e03344..8b4a7d769162 100644 --- a/init/main.c +++ b/init/main.c @@ -695,7 +695,7 @@ static void __init do_basic_setup(void) do_initcalls(); } -static void do_pre_smp_initcalls(void) +static void __init do_pre_smp_initcalls(void) { extern int spawn_ksoftirqd(void); #ifdef CONFIG_SMP |