[PATCH] fix UP links - current bk tree

From: Ed Tomlinson (tomlins@cam.org)
Date: Thu Aug 01 2002 - 07:07:17 EST


Hi,

UP links are failing with the current bk tree. migration_init is only
defined in sched.c when SMP is set so we should not try to call it
from main.c.

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.483 -> 1.484
# init/main.c 1.59 -> 1.60
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/08/01 ed@oscar.et.ca 1.484
# Fix so UP links do not ask for migration_init
# --------------------------------------------
#
diff -Nru a/init/main.c b/init/main.c
--- a/init/main.c Thu Aug 1 08:02:01 2002
+++ b/init/main.c Thu Aug 1 08:02:01 2002
@@ -526,10 +526,12 @@
 
 static void do_pre_smp_initcalls(void)
 {
- extern int migration_init(void);
         extern int spawn_ksoftirqd(void);
+#ifdef CONFIG_SMP
+ extern int migration_init(void);
 
         migration_init();
+#endif
         spawn_ksoftirqd();
 }
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Wed Aug 07 2002 - 22:00:15 EST