---

 25-akpm/init/main.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

diff -puN init/main.c~ia64-cpu-hotplug-cpu_present-2-fix init/main.c
--- 25/init/main.c~ia64-cpu-hotplug-cpu_present-2-fix	Tue May 11 14:05:38 2004
+++ 25-akpm/init/main.c	Tue May 11 14:05:38 2004
@@ -584,8 +584,9 @@ static void run_init_process(char *init_
 	execve(init_filename, argv_init, envp_init);
 }
 
-static void fixup_cpu_present_map(void)
+static inline void fixup_cpu_present_map(void)
 {
+#ifdef CONFIG_SMP
 	int i;
 
 	/*
@@ -598,6 +599,7 @@ static void fixup_cpu_present_map(void)
 			cpu_set(i, cpu_present_map);
 		}
 	}
+#endif
 }
 
 static int init(void * unused)

_