diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-11 12:28:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 14:17:06 -0400 |
| commit | 2e811488cedddefb9d1df97c260b6048ea8ef835 (patch) | |
| tree | b24390217e2c583099e311c678a88b33dbb1bd49 /arch/m68k/kernel | |
| parent | 437111ca381263520d23c877e55e0a83558e79da (diff) | |
[PATCH] clean m68k ksyms
sun3_ksyms gone, m68k_ksyms trimmed down to exports of the assembler ones,
for sun3 added the missing exports of __ioremap() and iounmap().
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k/kernel')
| -rw-r--r-- | arch/m68k/kernel/m68k_ksyms.c | 51 | ||||
| -rw-r--r-- | arch/m68k/kernel/process.c | 3 | ||||
| -rw-r--r-- | arch/m68k/kernel/setup.c | 15 |
3 files changed, 18 insertions, 51 deletions
diff --git a/arch/m68k/kernel/m68k_ksyms.c b/arch/m68k/kernel/m68k_ksyms.c index f9636e84e6..6fc69c74fe 100644 --- a/arch/m68k/kernel/m68k_ksyms.c +++ b/arch/m68k/kernel/m68k_ksyms.c | |||
| @@ -1,61 +1,10 @@ | |||
| 1 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 2 | #include <linux/linkage.h> | ||
| 3 | #include <linux/sched.h> | ||
| 4 | #include <linux/mm.h> | ||
| 5 | #include <linux/user.h> | ||
| 6 | #include <linux/elfcore.h> | ||
| 7 | #include <linux/in6.h> | ||
| 8 | #include <linux/interrupt.h> | ||
| 9 | |||
| 10 | #include <asm/setup.h> | ||
| 11 | #include <asm/machdep.h> | ||
| 12 | #include <asm/pgalloc.h> | ||
| 13 | #include <asm/irq.h> | ||
| 14 | #include <asm/io.h> | ||
| 15 | #include <asm/semaphore.h> | 2 | #include <asm/semaphore.h> |
| 16 | #include <asm/checksum.h> | ||
| 17 | 3 | ||
| 18 | asmlinkage long long __ashldi3 (long long, int); | 4 | asmlinkage long long __ashldi3 (long long, int); |
| 19 | asmlinkage long long __ashrdi3 (long long, int); | 5 | asmlinkage long long __ashrdi3 (long long, int); |
| 20 | asmlinkage long long __lshrdi3 (long long, int); | 6 | asmlinkage long long __lshrdi3 (long long, int); |
| 21 | asmlinkage long long __muldi3 (long long, long long); | 7 | asmlinkage long long __muldi3 (long long, long long); |
| 22 | extern char m68k_debug_device[]; | ||
| 23 | |||
| 24 | /* platform dependent support */ | ||
| 25 | |||
| 26 | EXPORT_SYMBOL(m68k_machtype); | ||
| 27 | EXPORT_SYMBOL(m68k_cputype); | ||
| 28 | EXPORT_SYMBOL(m68k_is040or060); | ||
| 29 | EXPORT_SYMBOL(m68k_realnum_memory); | ||
| 30 | EXPORT_SYMBOL(m68k_memory); | ||
| 31 | #ifndef CONFIG_SUN3 | ||
| 32 | EXPORT_SYMBOL(cache_push); | ||
| 33 | EXPORT_SYMBOL(cache_clear); | ||
| 34 | #ifndef CONFIG_SINGLE_MEMORY_CHUNK | ||
| 35 | EXPORT_SYMBOL(mm_vtop); | ||
| 36 | EXPORT_SYMBOL(mm_ptov); | ||
| 37 | EXPORT_SYMBOL(mm_end_of_chunk); | ||
| 38 | #else | ||
| 39 | EXPORT_SYMBOL(m68k_memoffset); | ||
| 40 | #endif /* !CONFIG_SINGLE_MEMORY_CHUNK */ | ||
| 41 | EXPORT_SYMBOL(__ioremap); | ||
| 42 | EXPORT_SYMBOL(iounmap); | ||
| 43 | EXPORT_SYMBOL(kernel_set_cachemode); | ||
| 44 | #endif /* !CONFIG_SUN3 */ | ||
| 45 | EXPORT_SYMBOL(m68k_debug_device); | ||
| 46 | EXPORT_SYMBOL(mach_hwclk); | ||
| 47 | EXPORT_SYMBOL(mach_get_ss); | ||
| 48 | EXPORT_SYMBOL(mach_get_rtc_pll); | ||
| 49 | EXPORT_SYMBOL(mach_set_rtc_pll); | ||
| 50 | #ifdef CONFIG_INPUT_M68K_BEEP_MODULE | ||
| 51 | EXPORT_SYMBOL(mach_beep); | ||
| 52 | #endif | ||
| 53 | EXPORT_SYMBOL(dump_fpu); | ||
| 54 | EXPORT_SYMBOL(dump_thread); | ||
| 55 | EXPORT_SYMBOL(kernel_thread); | ||
| 56 | #ifdef CONFIG_VME | ||
| 57 | EXPORT_SYMBOL(vme_brdtype); | ||
| 58 | #endif | ||
| 59 | 8 | ||
| 60 | /* The following are special because they're not called | 9 | /* The following are special because they're not called |
| 61 | explicitly (the C compiler generates them). Fortunately, | 10 | explicitly (the C compiler generates them). Fortunately, |
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index 24e83d54dc..99fc1226f7 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c | |||
| @@ -187,6 +187,7 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags) | |||
| 187 | set_fs (fs); | 187 | set_fs (fs); |
| 188 | return pid; | 188 | return pid; |
| 189 | } | 189 | } |
| 190 | EXPORT_SYMBOL(kernel_thread); | ||
| 190 | 191 | ||
| 191 | void flush_thread(void) | 192 | void flush_thread(void) |
| 192 | { | 193 | { |
| @@ -311,6 +312,7 @@ int dump_fpu (struct pt_regs *regs, struct user_m68kfp_struct *fpu) | |||
| 311 | : "memory"); | 312 | : "memory"); |
| 312 | return 1; | 313 | return 1; |
| 313 | } | 314 | } |
| 315 | EXPORT_SYMBOL(dump_fpu); | ||
| 314 | 316 | ||
| 315 | /* | 317 | /* |
| 316 | * fill in the user structure for a core dump.. | 318 | * fill in the user structure for a core dump.. |
| @@ -357,6 +359,7 @@ void dump_thread(struct pt_regs * regs, struct user * dump) | |||
| 357 | /* dump floating point stuff */ | 359 | /* dump floating point stuff */ |
| 358 | dump->u_fpvalid = dump_fpu (regs, &dump->m68kfp); | 360 | dump->u_fpvalid = dump_fpu (regs, &dump->m68kfp); |
| 359 | } | 361 | } |
| 362 | EXPORT_SYMBOL(dump_thread); | ||
| 360 | 363 | ||
| 361 | /* | 364 | /* |
| 362 | * sys_execve() executes a new program. | 365 | * sys_execve() executes a new program. |
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c index 42d5b85f33..9af3ee0e55 100644 --- a/arch/m68k/kernel/setup.c +++ b/arch/m68k/kernel/setup.c | |||
| @@ -42,27 +42,37 @@ | |||
| 42 | 42 | ||
| 43 | unsigned long m68k_machtype; | 43 | unsigned long m68k_machtype; |
| 44 | unsigned long m68k_cputype; | 44 | unsigned long m68k_cputype; |
| 45 | EXPORT_SYMBOL(m68k_machtype); | ||
| 46 | EXPORT_SYMBOL(m68k_cputype); | ||
| 45 | unsigned long m68k_fputype; | 47 | unsigned long m68k_fputype; |
| 46 | unsigned long m68k_mmutype; | 48 | unsigned long m68k_mmutype; |
| 47 | #ifdef CONFIG_VME | 49 | #ifdef CONFIG_VME |
| 48 | unsigned long vme_brdtype; | 50 | unsigned long vme_brdtype; |
| 51 | EXPORT_SYMBOL(vme_brdtype); | ||
| 49 | #endif | 52 | #endif |
| 50 | 53 | ||
| 51 | int m68k_is040or060; | 54 | int m68k_is040or060; |
| 55 | EXPORT_SYMBOL(m68k_is040or060); | ||
| 52 | 56 | ||
| 53 | extern int end; | 57 | extern int end; |
| 54 | extern unsigned long availmem; | 58 | extern unsigned long availmem; |
| 55 | 59 | ||
| 56 | int m68k_num_memory; | 60 | int m68k_num_memory; |
| 57 | int m68k_realnum_memory; | 61 | int m68k_realnum_memory; |
| 62 | EXPORT_SYMBOL(m68k_realnum_memory); | ||
| 63 | #ifdef CONFIG_SINGLE_MEMORY_CHUNK | ||
| 58 | unsigned long m68k_memoffset; | 64 | unsigned long m68k_memoffset; |
| 65 | EXPORT_SYMBOL(m68k_memoffset); | ||
| 66 | #endif | ||
| 59 | struct mem_info m68k_memory[NUM_MEMINFO]; | 67 | struct mem_info m68k_memory[NUM_MEMINFO]; |
| 68 | EXPORT_SYMBOL(m68k_memory); | ||
| 60 | 69 | ||
| 61 | static struct mem_info m68k_ramdisk; | 70 | static struct mem_info m68k_ramdisk; |
| 62 | 71 | ||
| 63 | static char m68k_command_line[CL_SIZE]; | 72 | static char m68k_command_line[CL_SIZE]; |
| 64 | 73 | ||
| 65 | char m68k_debug_device[6] = ""; | 74 | char m68k_debug_device[6] = ""; |
| 75 | EXPORT_SYMBOL(m68k_debug_device); | ||
| 66 | 76 | ||
| 67 | void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL; | 77 | void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL; |
| 68 | /* machine dependent irq functions */ | 78 | /* machine dependent irq functions */ |
| @@ -72,10 +82,14 @@ int (*mach_get_hardware_list) (char *buffer); | |||
| 72 | /* machine dependent timer functions */ | 82 | /* machine dependent timer functions */ |
| 73 | unsigned long (*mach_gettimeoffset) (void); | 83 | unsigned long (*mach_gettimeoffset) (void); |
| 74 | int (*mach_hwclk) (int, struct rtc_time*); | 84 | int (*mach_hwclk) (int, struct rtc_time*); |
| 85 | EXPORT_SYMBOL(mach_hwclk); | ||
| 75 | int (*mach_set_clock_mmss) (unsigned long); | 86 | int (*mach_set_clock_mmss) (unsigned long); |
| 76 | unsigned int (*mach_get_ss)(void); | 87 | unsigned int (*mach_get_ss)(void); |
| 77 | int (*mach_get_rtc_pll)(struct rtc_pll_info *); | 88 | int (*mach_get_rtc_pll)(struct rtc_pll_info *); |
| 78 | int (*mach_set_rtc_pll)(struct rtc_pll_info *); | 89 | int (*mach_set_rtc_pll)(struct rtc_pll_info *); |
| 90 | EXPORT_SYMBOL(mach_get_ss); | ||
| 91 | EXPORT_SYMBOL(mach_get_rtc_pll); | ||
| 92 | EXPORT_SYMBOL(mach_set_rtc_pll); | ||
| 79 | void (*mach_reset)( void ); | 93 | void (*mach_reset)( void ); |
| 80 | void (*mach_halt)( void ); | 94 | void (*mach_halt)( void ); |
| 81 | void (*mach_power_off)( void ); | 95 | void (*mach_power_off)( void ); |
| @@ -89,6 +103,7 @@ void (*mach_l2_flush) (int); | |||
| 89 | #endif | 103 | #endif |
| 90 | #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE) | 104 | #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE) |
| 91 | void (*mach_beep)(unsigned int, unsigned int); | 105 | void (*mach_beep)(unsigned int, unsigned int); |
| 106 | EXPORT_SYMBOL(mach_beep); | ||
| 92 | #endif | 107 | #endif |
| 93 | #if defined(CONFIG_ISA) && defined(MULTI_ISA) | 108 | #if defined(CONFIG_ISA) && defined(MULTI_ISA) |
| 94 | int isa_type; | 109 | int isa_type; |
