aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-11-11 04:22:55 -0500
committerPaul Mundt <lethal@linux-sh.org>2008-01-27 23:18:46 -0500
commit4b7be4f2e0235c6824641503e2a8ff3b85e105d7 (patch)
tree5e6385a45371fcc69cebeaab8bad452fc96b9990
parent343ac72248d360f1fae72176aca1117be19189ec (diff)
sh: Split out sh_ksyms.c in to _32 and _64 variants.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/kernel/Makefile_322
-rw-r--r--arch/sh/kernel/Makefile_642
-rw-r--r--arch/sh/kernel/sh_ksyms_32.c (renamed from arch/sh/kernel/sh_ksyms.c)2
-rw-r--r--arch/sh/kernel/sh_ksyms_64.c (renamed from arch/sh64/kernel/sh_ksyms.c)6
4 files changed, 2 insertions, 10 deletions
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
15obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o 15obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o
16obj-$(CONFIG_SH_KGDB) += kgdb_stub.o kgdb_jmp.o 16obj-$(CONFIG_SH_KGDB) += kgdb_stub.o kgdb_jmp.o
17obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o 17obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o
18obj-$(CONFIG_MODULES) += sh_ksyms.o module.o 18obj-$(CONFIG_MODULES) += sh_ksyms_32.o module.o
19obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 19obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
20obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o 20obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
21obj-$(CONFIG_CRASH_DUMP) += crash_dump.o 21obj-$(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
11obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o 11obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o
12obj-$(CONFIG_SH_KGDB) += kgdb_stub.o kgdb_jmp.o 12obj-$(CONFIG_SH_KGDB) += kgdb_stub.o kgdb_jmp.o
13obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o 13obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o
14obj-$(CONFIG_MODULES) += sh_ksyms.o module.o 14obj-$(CONFIG_MODULES) += sh_ksyms_64.o module.o
15obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 15obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
16obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o 16obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
17obj-$(CONFIG_CRASH_DUMP) += crash_dump.o 17obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
diff --git a/arch/sh/kernel/sh_ksyms.c b/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);
141#endif 141#endif
142 142
143EXPORT_SYMBOL(csum_partial); 143EXPORT_SYMBOL(csum_partial);
144#ifdef CONFIG_SUPERH32
145EXPORT_SYMBOL(csum_partial_copy_generic); 144EXPORT_SYMBOL(csum_partial_copy_generic);
146#endif
147#ifdef CONFIG_IPV6 145#ifdef CONFIG_IPV6
148EXPORT_SYMBOL(csum_ipv6_magic); 146EXPORT_SYMBOL(csum_ipv6_magic);
149#endif 147#endif
diff --git a/arch/sh64/kernel/sh_ksyms.c b/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 @@
8 * Copyright (C) 2000, 2001 Paolo Alberelli 8 * Copyright (C) 2000, 2001 Paolo Alberelli
9 * 9 *
10 */ 10 */
11
12#include <linux/rwsem.h> 11#include <linux/rwsem.h>
13#include <linux/module.h> 12#include <linux/module.h>
14#include <linux/smp.h> 13#include <linux/smp.h>
@@ -18,7 +17,6 @@
18#include <linux/in6.h> 17#include <linux/in6.h>
19#include <linux/interrupt.h> 18#include <linux/interrupt.h>
20#include <linux/screen_info.h> 19#include <linux/screen_info.h>
21
22#include <asm/semaphore.h> 20#include <asm/semaphore.h>
23#include <asm/processor.h> 21#include <asm/processor.h>
24#include <asm/uaccess.h> 22#include <asm/uaccess.h>
@@ -47,12 +45,8 @@ EXPORT_SYMBOL(__put_user_asm_l);
47EXPORT_SYMBOL(__get_user_asm_l); 45EXPORT_SYMBOL(__get_user_asm_l);
48EXPORT_SYMBOL(__copy_user); 46EXPORT_SYMBOL(__copy_user);
49EXPORT_SYMBOL(memcpy); 47EXPORT_SYMBOL(memcpy);
50EXPORT_SYMBOL(udelay);
51EXPORT_SYMBOL(__udelay); 48EXPORT_SYMBOL(__udelay);
52EXPORT_SYMBOL(ndelay);
53EXPORT_SYMBOL(__ndelay); 49EXPORT_SYMBOL(__ndelay);
54EXPORT_SYMBOL(flush_dcache_page);
55EXPORT_SYMBOL(sh64_page_clear);
56 50
57/* Ugh. These come in from libgcc.a at link time. */ 51/* Ugh. These come in from libgcc.a at link time. */
58#define DECLARE_EXPORT(name) extern void name(void);EXPORT_SYMBOL(name) 52#define DECLARE_EXPORT(name) extern void name(void);EXPORT_SYMBOL(name)