From: Greg Ungerer <gerg@uclinux.org>
To: linux-m68k@vger.kernel.org
Cc: Greg Ungerer <gerg@uclinux.org>
Subject: [PATCH 5/5] m68k: merge non-mmu and mmu versions of m68k_ksyms.c
Date: Fri, 8 Apr 2011 22:17:02 +1000 [thread overview]
Message-ID: <1302265022-6614-6-git-send-email-gerg@uclinux.org> (raw)
In-Reply-To: <1302265022-6614-5-git-send-email-gerg@uclinux.org>
After cleaning up m68k_ksyms_no.c it is now strait forward to merge
the non-mmu and mmu versions of m68k_ksyms.c. So do it.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/kernel/m68k_ksyms.c | 35 ++++++++++++++++++++++++++---
arch/m68k/kernel/m68k_ksyms_mm.c | 16 -------------
arch/m68k/kernel/m68k_ksyms_no.c | 44 --------------------------------------
3 files changed, 31 insertions(+), 64 deletions(-)
delete mode 100644 arch/m68k/kernel/m68k_ksyms_mm.c
delete mode 100644 arch/m68k/kernel/m68k_ksyms_no.c
diff --git a/arch/m68k/kernel/m68k_ksyms.c b/arch/m68k/kernel/m68k_ksyms.c
index 4752c28..3e23913 100644
--- a/arch/m68k/kernel/m68k_ksyms.c
+++ b/arch/m68k/kernel/m68k_ksyms.c
@@ -1,5 +1,32 @@
-#ifdef CONFIG_MMU
-#include "m68k_ksyms_mm.c"
-#else
-#include "m68k_ksyms_no.c"
+#include <linux/module.h>
+
+asmlinkage long long __ashldi3 (long long, int);
+asmlinkage long long __ashrdi3 (long long, int);
+asmlinkage long long __lshrdi3 (long long, int);
+asmlinkage long long __muldi3 (long long, long long);
+
+/* The following are special because they're not called
+ explicitly (the C compiler generates them). Fortunately,
+ their interface isn't gonna change any time soon now, so
+ it's OK to leave it out of version control. */
+EXPORT_SYMBOL(__ashldi3);
+EXPORT_SYMBOL(__ashrdi3);
+EXPORT_SYMBOL(__lshrdi3);
+EXPORT_SYMBOL(__muldi3);
+
+#ifndef CONFIG_MMU
+/*
+ * Simpler 68k and ColdFire parts also need a few other gcc functions.
+ */
+extern long long __divsi3(long long, long long);
+extern long long __modsi3(long long, long long);
+extern long long __mulsi3(long long, long long);
+extern long long __udivsi3(long long, long long);
+extern long long __umodsi3(long long, long long);
+
+EXPORT_SYMBOL(__divsi3);
+EXPORT_SYMBOL(__modsi3);
+EXPORT_SYMBOL(__mulsi3);
+EXPORT_SYMBOL(__udivsi3);
+EXPORT_SYMBOL(__umodsi3);
#endif
diff --git a/arch/m68k/kernel/m68k_ksyms_mm.c b/arch/m68k/kernel/m68k_ksyms_mm.c
deleted file mode 100644
index d900e77..0000000
--- a/arch/m68k/kernel/m68k_ksyms_mm.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <linux/module.h>
-
-asmlinkage long long __ashldi3 (long long, int);
-asmlinkage long long __ashrdi3 (long long, int);
-asmlinkage long long __lshrdi3 (long long, int);
-asmlinkage long long __muldi3 (long long, long long);
-
-/* The following are special because they're not called
- explicitly (the C compiler generates them). Fortunately,
- their interface isn't gonna change any time soon now, so
- it's OK to leave it out of version control. */
-EXPORT_SYMBOL(__ashldi3);
-EXPORT_SYMBOL(__ashrdi3);
-EXPORT_SYMBOL(__lshrdi3);
-EXPORT_SYMBOL(__muldi3);
-
diff --git a/arch/m68k/kernel/m68k_ksyms_no.c b/arch/m68k/kernel/m68k_ksyms_no.c
deleted file mode 100644
index db6f87a..0000000
--- a/arch/m68k/kernel/m68k_ksyms_no.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <linux/module.h>
-#include <linux/linkage.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/user.h>
-#include <linux/elfcore.h>
-#include <linux/in6.h>
-#include <linux/interrupt.h>
-
-#include <asm/setup.h>
-#include <asm/machdep.h>
-#include <asm/pgalloc.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-#include <asm/checksum.h>
-#include <asm/current.h>
-
-/*
- * libgcc functions - functions that are used internally by the
- * compiler... (prototypes are not correct though, but that
- * doesn't really matter since they're not versioned).
- */
-extern void __ashldi3(void);
-extern void __ashrdi3(void);
-extern void __divsi3(void);
-extern void __lshrdi3(void);
-extern void __modsi3(void);
-extern void __muldi3(void);
-extern void __mulsi3(void);
-extern void __udivsi3(void);
-extern void __umodsi3(void);
-
- /* gcc lib functions */
-EXPORT_SYMBOL(__ashldi3);
-EXPORT_SYMBOL(__ashrdi3);
-EXPORT_SYMBOL(__divsi3);
-EXPORT_SYMBOL(__lshrdi3);
-EXPORT_SYMBOL(__modsi3);
-EXPORT_SYMBOL(__muldi3);
-EXPORT_SYMBOL(__mulsi3);
-EXPORT_SYMBOL(__udivsi3);
-EXPORT_SYMBOL(__umodsi3);
-
--
1.7.0.4
next prev parent reply other threads:[~2011-04-08 12:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-08 12:16 [PATCH 0/5] m68k: merge mmu and non-mmu kernel/m68k_ksyms.c files Greg Ungerer
2011-04-08 12:16 ` [PATCH 1/5] m68knommu: move EXPORT of dump_fpu to function definition Greg Ungerer
2011-04-08 12:16 ` [PATCH 2/5] m68knommu: move EXPORT of local checksumming functions to definitions Greg Ungerer
2011-04-08 12:17 ` [PATCH 3/5] m68knommu: move EXPORT of kernel_thread to function definition Greg Ungerer
2011-04-08 12:17 ` [PATCH 4/5] m68knommu: remove un-needed exporting of COLDFIRE symbols Greg Ungerer
2011-04-08 12:17 ` Greg Ungerer [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-04-21 0:48 [PATCH 0/5] m68k: merge and clean up of arch/m68k/kernel/m68k_ksyms*.c files gerg
2011-04-21 0:48 ` [PATCH 1/5] m68knommu: move EXPORT of dump_fpu to function definition gerg
2011-04-21 0:48 ` [PATCH 2/5] m68knommu: move EXPORT of local checksumming functions to definitions gerg
2011-04-21 0:48 ` [PATCH 3/5] m68knommu: move EXPORT of kernel_thread to function definition gerg
2011-04-21 0:48 ` [PATCH 4/5] m68knommu: remove un-needed exporting of COLDFIRE symbols gerg
2011-04-21 0:48 ` [PATCH 5/5] m68k: merge non-mmu and mmu versions of m68k_ksyms.c gerg
2011-04-21 8:16 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1302265022-6614-6-git-send-email-gerg@uclinux.org \
--to=gerg@uclinux.org \
--cc=linux-m68k@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox