From 4b7be4f2e0235c6824641503e2a8ff3b85e105d7 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Sun, 11 Nov 2007 18:22:55 +0900 Subject: [PATCH] sh: Split out sh_ksyms.c in to _32 and _64 variants. Signed-off-by: Paul Mundt --- arch/sh/kernel/Makefile_32 | 2 +- arch/sh/kernel/Makefile_64 | 2 +- arch/sh/kernel/{sh_ksyms.c => sh_ksyms_32.c} | 2 -- arch/{sh64/kernel/sh_ksyms.c => sh/kernel/sh_ksyms_64.c} | 6 ------ 4 files changed, 2 insertions(+), 10 deletions(-) rename arch/sh/kernel/{sh_ksyms.c => sh_ksyms_32.c} (99%) rename arch/{sh64/kernel/sh_ksyms.c => sh/kernel/sh_ksyms_64.c} (92%) diff --git a/arch/sh/kernel/Makefile_32 b/arch/sh/kernel/Makefile_32 index c5a85bfbd451..5c7fa594d6d1 100644 --- a/arch/sh/kernel/Makefile_32 +++ b/arch/sh/kernel/Makefile_32 @@ -15,7 +15,7 @@ obj-$(CONFIG_CF_ENABLER) += cf-enabler.o obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o obj-$(CONFIG_SH_KGDB) += kgdb_stub.o kgdb_jmp.o obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o -obj-$(CONFIG_MODULES) += sh_ksyms.o module.o +obj-$(CONFIG_MODULES) += sh_ksyms_32.o module.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o diff --git a/arch/sh/kernel/Makefile_64 b/arch/sh/kernel/Makefile_64 index 41b3efc25686..585b6a11d3f6 100644 --- a/arch/sh/kernel/Makefile_64 +++ b/arch/sh/kernel/Makefile_64 @@ -11,7 +11,7 @@ obj-$(CONFIG_CF_ENABLER) += cf-enabler.o obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o obj-$(CONFIG_SH_KGDB) += kgdb_stub.o kgdb_jmp.o obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o -obj-$(CONFIG_MODULES) += sh_ksyms.o module.o +obj-$(CONFIG_MODULES) += sh_ksyms_64.o module.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms_32.c similarity index 99% rename from arch/sh/kernel/sh_ksyms.c rename to arch/sh/kernel/sh_ksyms_32.c index bc5239ef88ce..e1a6de9088b5 100644 --- a/arch/sh/kernel/sh_ksyms.c +++ b/arch/sh/kernel/sh_ksyms_32.c @@ -141,9 +141,7 @@ EXPORT_SYMBOL(clear_user_page); #endif EXPORT_SYMBOL(csum_partial); -#ifdef CONFIG_SUPERH32 EXPORT_SYMBOL(csum_partial_copy_generic); -#endif #ifdef CONFIG_IPV6 EXPORT_SYMBOL(csum_ipv6_magic); #endif diff --git a/arch/sh64/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms_64.c similarity index 92% rename from arch/sh64/kernel/sh_ksyms.c rename to arch/sh/kernel/sh_ksyms_64.c index b1705acc8e64..fbc991c33f5a 100644 --- a/arch/sh64/kernel/sh_ksyms.c +++ b/arch/sh/kernel/sh_ksyms_64.c @@ -8,7 +8,6 @@ * Copyright (C) 2000, 2001 Paolo Alberelli * */ - #include #include #include @@ -18,7 +17,6 @@ #include #include #include - #include #include #include @@ -47,12 +45,8 @@ EXPORT_SYMBOL(__put_user_asm_l); EXPORT_SYMBOL(__get_user_asm_l); EXPORT_SYMBOL(__copy_user); EXPORT_SYMBOL(memcpy); -EXPORT_SYMBOL(udelay); EXPORT_SYMBOL(__udelay); -EXPORT_SYMBOL(ndelay); EXPORT_SYMBOL(__ndelay); -EXPORT_SYMBOL(flush_dcache_page); -EXPORT_SYMBOL(sh64_page_clear); /* Ugh. These come in from libgcc.a at link time. */ #define DECLARE_EXPORT(name) extern void name(void);EXPORT_SYMBOL(name)