patch-2.1.17 linux/arch/m68k/kernel/ksyms.c

• Lines: 74
• Date: Fri Dec 20 11:19:58 1996
• Orig file: v2.1.16/linux/arch/m68k/kernel/ksyms.c
• Orig date: Fri Nov 22 18:28:17 1996

diff -u --recursive --new-file v2.1.16/linux/arch/m68k/kernel/ksyms.c linux/arch/m68k/kernel/ksyms.c
@@ -1,4 +1,3 @@
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/linkage.h>
 #include <linux/sched.h>
@@ -8,6 +7,7 @@
 #include <linux/elfcore.h>
 
 #include <asm/setup.h>
+#include <asm/machdep.h>
 #include <asm/pgtable.h>
 #include <asm/irq.h>
 #include <asm/semaphore.h>
@@ -15,16 +15,6 @@
 asmlinkage long long __ashrdi3 (long long, int);
 extern char m68k_debug_device[];
 
-#ifdef CONFIG_ATARI
-extern void mach_atari_syms_export (void);
-#endif
-#ifdef CONFIG_AMIGA
-extern void mach_amiga_syms_export (void);
-#endif
-#ifdef CONFIG_MAC
-extern void mach_mac_syms_export (void);
-#endif
-
 extern void dump_thread(struct pt_regs *, struct user *);
 extern int dump_fpu(elf_fpregset_t *);
 
@@ -33,7 +23,8 @@
 	/* platform dependent support */
 
 	X(memcmp),
-	X(boot_info),
+	X(m68k_machtype),
+	X(m68k_cputype),
 	X(m68k_is040or060),
 	X(cache_push),
 	X(cache_push_v),
@@ -48,6 +39,7 @@
 	X(dump_thread),
 	X(strnlen),
 	X(strrchr),
+	X(strstr),
 
 	/* The following are special because they're not called
 	   explicitly (the C compiler generates them).  Fortunately,
@@ -67,23 +59,6 @@
 {
 	register_symtab(&arch_symbol_table);
 
-	switch (boot_info.machtype) {
-#ifdef CONFIG_ATARI
-	case MACH_ATARI:
-		mach_atari_syms_export();
-		break;
-#endif
-#ifdef CONFIG_AMIGA
-	case MACH_AMIGA:
-		mach_amiga_syms_export();
-		break;
-#endif
-#ifdef CONFIG_MAC
-	case MACH_MAC:
-		mach_mac_syms_export();
-		break;
-#endif
-	default:
-		break;
-	}
+	if (mach_syms_export)
+	    mach_syms_export();
 }