fix UP links - current bk tree

fix UP links - current bk tree

Post by Ed Tomlinso » Fri, 02 Aug 2002 21:10:08



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
# --------------------------------------------

# 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

 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

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 
 
 

1. fix current BK tree compilation with devfs enabled

Not that I care for devfs, but there was at least one report on lkml.

I tried to also put the devfs_handle_t under CONFIG_DEVFS_FS, but the
devfs wrappers require it.  And yes, I'm seriously pissed that devfs
puts wordsize objects everywhere even if not enabled.

--- linux-2.4.20-bk-20020810/include/linux/genhd.h      Sat Aug 10 14:37:16 2002

        unsigned long start_sect;
        unsigned long nr_sects;
        devfs_handle_t de;              /* primary (master) devfs entry  */
-
+#ifdef CONFIG_DEVFS_FS
+       int number;
+#endif /* CONFIG_DEVFS_FS */
 #ifdef CONFIG_BLK_STATS
        /* Performance stats: */
        unsigned int ios_in_flight;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

2. Whatever happened to ipmasqadm module?

3. Nightly regression runs against current bk tree

4. HELP : *.tgz extension + General LINUX

5. bad: schedule() with irqs disabled! - current bk tree

6. login to novell network

7. PANIC caused by dequeue_signal() in current Linus BK tree

8. CNews on Unixware

9. pfn-Functionset out of order for sparc64 in current Bk tree?

10. IDE from current bk tree, UDMA and two channels...

11. BUG: Current 2.5-BK tree dies on boot!

12. Nightly regression runs against current bk tree

13. UP compilation fix for bk tree