Skip to content

Commit

Permalink
m68k: move exports to definitions
Browse files Browse the repository at this point in the history
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Aug 8, 2016
1 parent 00fc0e0 commit d13ffb5
Show file tree
Hide file tree
Showing 12 changed files with 32 additions and 39 deletions.
3 changes: 3 additions & 0 deletions arch/m68k/include/asm/export.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#define KSYM_ALIGN 2
#define KCRC_ALIGN 2
#include <asm-generic/export.h>
2 changes: 1 addition & 1 deletion arch/m68k/kernel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extra-$(CONFIG_SUN3X) := head.o
extra-$(CONFIG_SUN3) := sun3-head.o
extra-y += vmlinux.lds

obj-y := entry.o irq.o m68k_ksyms.o module.o process.o ptrace.o
obj-y := entry.o irq.o module.o process.o ptrace.o
obj-y += setup.o signal.o sys_m68k.o syscalltable.o time.o traps.o

obj-$(CONFIG_MMU_MOTOROLA) += ints.o vectors.o
Expand Down
32 changes: 0 additions & 32 deletions arch/m68k/kernel/m68k_ksyms.c

This file was deleted.

4 changes: 4 additions & 0 deletions arch/m68k/lib/ashldi3.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. */

#include <linux/compiler.h>
#include <linux/export.h>

#define BITS_PER_UNIT 8

typedef int SItype __attribute__ ((mode (SI)));
Expand Down Expand Up @@ -55,3 +58,4 @@ __ashldi3 (DItype u, word_type b)

return w.ll;
}
EXPORT_SYMBOL(__ashldi3);
4 changes: 4 additions & 0 deletions arch/m68k/lib/ashrdi3.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. */

#include <linux/compiler.h>
#include <linux/export.h>

#define BITS_PER_UNIT 8

typedef int SItype __attribute__ ((mode (SI)));
Expand Down Expand Up @@ -56,3 +59,4 @@ __ashrdi3 (DItype u, word_type b)

return w.ll;
}
EXPORT_SYMBOL(__ashrdi3);
3 changes: 3 additions & 0 deletions arch/m68k/lib/divsi3.S
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ General Public License for more details. */
D. V. Henkel-Wallace (gumby@cygnus.com) Fete Bastille, 1992
*/

#include <asm/export.h>

/* These are predefined by new versions of GNU cpp. */

#ifndef __USER_LABEL_PREFIX__
Expand Down Expand Up @@ -118,3 +120,4 @@ L2: movel d1, sp@-
L3: movel sp@+, d2
rts

EXPORT_SYMBOL(__divsi3)
4 changes: 4 additions & 0 deletions arch/m68k/lib/lshrdi3.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. */

#include <linux/compiler.h>
#include <linux/export.h>

#define BITS_PER_UNIT 8

typedef int SItype __attribute__ ((mode (SI)));
Expand Down Expand Up @@ -55,3 +58,4 @@ __lshrdi3 (DItype u, word_type b)

return w.ll;
}
EXPORT_SYMBOL(__lshrdi3);
3 changes: 3 additions & 0 deletions arch/m68k/lib/modsi3.S
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ General Public License for more details. */
D. V. Henkel-Wallace (gumby@cygnus.com) Fete Bastille, 1992
*/

#include <asm/export.h>

/* These are predefined by new versions of GNU cpp. */

#ifndef __USER_LABEL_PREFIX__
Expand Down Expand Up @@ -106,3 +108,4 @@ SYM (__modsi3):
movel d1, d0
rts

EXPORT_SYMBOL(__modsi3)
4 changes: 4 additions & 0 deletions arch/m68k/lib/muldi3.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. */

#include <linux/compiler.h>
#include <linux/export.h>

#ifdef CONFIG_CPU_HAS_NO_MULDIV64

#define SI_TYPE_SIZE 32
Expand Down Expand Up @@ -90,3 +93,4 @@ __muldi3 (DItype u, DItype v)

return w.ll;
}
EXPORT_SYMBOL(__muldi3);
4 changes: 2 additions & 2 deletions arch/m68k/lib/mulsi3.S
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ General Public License for more details. */
Some of this code comes from MINIX, via the folks at ericsson.
D. V. Henkel-Wallace (gumby@cygnus.com) Fete Bastille, 1992
*/

#include <asm/export.h>
/* These are predefined by new versions of GNU cpp. */

#ifndef __USER_LABEL_PREFIX__
Expand Down Expand Up @@ -102,4 +102,4 @@ SYM (__mulsi3):
addl d1, d0

rts

EXPORT_SYMBOL(__mulsi3)
4 changes: 2 additions & 2 deletions arch/m68k/lib/udivsi3.S
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ General Public License for more details. */
Some of this code comes from MINIX, via the folks at ericsson.
D. V. Henkel-Wallace (gumby@cygnus.com) Fete Bastille, 1992
*/

#include <asm/export.h>
/* These are predefined by new versions of GNU cpp. */

#ifndef __USER_LABEL_PREFIX__
Expand Down Expand Up @@ -154,4 +154,4 @@ L2: subql IMM (1),d4
unlk a6 | and return
rts
#endif /* __mcf5200__ || __mcoldfire__ */

EXPORT_SYMBOL(__udivsi3)
4 changes: 2 additions & 2 deletions arch/m68k/lib/umodsi3.S
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ General Public License for more details. */
Some of this code comes from MINIX, via the folks at ericsson.
D. V. Henkel-Wallace (gumby@cygnus.com) Fete Bastille, 1992
*/

#include <asm/export.h>
/* These are predefined by new versions of GNU cpp. */

#ifndef __USER_LABEL_PREFIX__
Expand Down Expand Up @@ -105,4 +105,4 @@ SYM (__umodsi3):
subl d0, d1 /* d1 = a - (a/b)*b */
movel d1, d0
rts

EXPORT_SYMBOL(__umodsi3)

0 comments on commit d13ffb5

Please sign in to comment.