diff options
-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) { } | |||
495 | #endif | 495 | #endif |
496 | 496 | ||
497 | /* Overridden in paravirt.c if CONFIG_PARAVIRT */ | 497 | /* Overridden in paravirt.c if CONFIG_PARAVIRT */ |
498 | char * __attribute__((weak)) memory_setup(void) | 498 | char * __init __attribute__((weak)) memory_setup(void) |
499 | { | 499 | { |
500 | return machine_specific_memory_setup(); | 500 | return machine_specific_memory_setup(); |
501 | } | 501 | } |
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) | |||
695 | do_initcalls(); | 695 | do_initcalls(); |
696 | } | 696 | } |
697 | 697 | ||
698 | static void do_pre_smp_initcalls(void) | 698 | static void __init do_pre_smp_initcalls(void) |
699 | { | 699 | { |
700 | extern int spawn_ksoftirqd(void); | 700 | extern int spawn_ksoftirqd(void); |
701 | #ifdef CONFIG_SMP | 701 | #ifdef CONFIG_SMP |