---

yaml --- r: 45465 b: refs/heads/master c: 88d2032 h: refs/heads/master i: 45463: a9c1670 v: v3
git-mirror · Jan 11, 2007 · 6b4e101 · 6b4e101
1 parent dbd30b1
commit 6b4e101
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e0be25d31f75f64b6fbe00f0b4e5d6b1ad1438e
+refs/heads/master: 88d20328cd66ee05f9b7f4d414640700db69d82b
diff --git a/trunk/arch/i386/kernel/setup.c b/trunk/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/trunk/init/main.c b/trunk/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