Skip to content

Commit d13ffb5

Browse files
author
Al Viro
committed
m68k: move exports to definitions
Acked-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Al Viro <[email protected]>
1 parent 00fc0e0 commit d13ffb5

File tree

12 files changed

+32
-39
lines changed

12 files changed

+32
-39
lines changed

arch/m68k/include/asm/export.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#define KSYM_ALIGN 2
2+
#define KCRC_ALIGN 2
3+
#include <asm-generic/export.h>

arch/m68k/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extra-$(CONFIG_SUN3X) := head.o
1313
extra-$(CONFIG_SUN3) := sun3-head.o
1414
extra-y += vmlinux.lds
1515

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

1919
obj-$(CONFIG_MMU_MOTOROLA) += ints.o vectors.o

arch/m68k/kernel/m68k_ksyms.c

Lines changed: 0 additions & 32 deletions
This file was deleted.

arch/m68k/lib/ashldi3.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
1313
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1414
GNU General Public License for more details. */
1515

16+
#include <linux/compiler.h>
17+
#include <linux/export.h>
18+
1619
#define BITS_PER_UNIT 8
1720

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

5659
return w.ll;
5760
}
61+
EXPORT_SYMBOL(__ashldi3);

arch/m68k/lib/ashrdi3.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
1313
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1414
GNU General Public License for more details. */
1515

16+
#include <linux/compiler.h>
17+
#include <linux/export.h>
18+
1619
#define BITS_PER_UNIT 8
1720

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

5760
return w.ll;
5861
}
62+
EXPORT_SYMBOL(__ashrdi3);

arch/m68k/lib/divsi3.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ General Public License for more details. */
3333
D. V. Henkel-Wallace ([email protected]) Fete Bastille, 1992
3434
*/
3535

36+
#include <asm/export.h>
37+
3638
/* These are predefined by new versions of GNU cpp. */
3739

3840
#ifndef __USER_LABEL_PREFIX__
@@ -118,3 +120,4 @@ L2: movel d1, sp@-
118120
L3: movel sp@+, d2
119121
rts
120122

123+
EXPORT_SYMBOL(__divsi3)

arch/m68k/lib/lshrdi3.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
1313
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1414
GNU General Public License for more details. */
1515

16+
#include <linux/compiler.h>
17+
#include <linux/export.h>
18+
1619
#define BITS_PER_UNIT 8
1720

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

5659
return w.ll;
5760
}
61+
EXPORT_SYMBOL(__lshrdi3);

arch/m68k/lib/modsi3.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ General Public License for more details. */
3333
D. V. Henkel-Wallace ([email protected]) Fete Bastille, 1992
3434
*/
3535

36+
#include <asm/export.h>
37+
3638
/* These are predefined by new versions of GNU cpp. */
3739

3840
#ifndef __USER_LABEL_PREFIX__
@@ -106,3 +108,4 @@ SYM (__modsi3):
106108
movel d1, d0
107109
rts
108110

111+
EXPORT_SYMBOL(__modsi3)

arch/m68k/lib/muldi3.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1515
GNU General Public License for more details. */
1616

17+
#include <linux/compiler.h>
18+
#include <linux/export.h>
19+
1720
#ifdef CONFIG_CPU_HAS_NO_MULDIV64
1821

1922
#define SI_TYPE_SIZE 32
@@ -90,3 +93,4 @@ __muldi3 (DItype u, DItype v)
9093

9194
return w.ll;
9295
}
96+
EXPORT_SYMBOL(__muldi3);

arch/m68k/lib/mulsi3.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ General Public License for more details. */
3232
Some of this code comes from MINIX, via the folks at ericsson.
3333
D. V. Henkel-Wallace ([email protected]) Fete Bastille, 1992
3434
*/
35-
35+
#include <asm/export.h>
3636
/* These are predefined by new versions of GNU cpp. */
3737

3838
#ifndef __USER_LABEL_PREFIX__
@@ -102,4 +102,4 @@ SYM (__mulsi3):
102102
addl d1, d0
103103

104104
rts
105-
105+
EXPORT_SYMBOL(__mulsi3)

arch/m68k/lib/udivsi3.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ General Public License for more details. */
3232
Some of this code comes from MINIX, via the folks at ericsson.
3333
D. V. Henkel-Wallace ([email protected]) Fete Bastille, 1992
3434
*/
35-
35+
#include <asm/export.h>
3636
/* These are predefined by new versions of GNU cpp. */
3737

3838
#ifndef __USER_LABEL_PREFIX__
@@ -154,4 +154,4 @@ L2: subql IMM (1),d4
154154
unlk a6 | and return
155155
rts
156156
#endif /* __mcf5200__ || __mcoldfire__ */
157-
157+
EXPORT_SYMBOL(__udivsi3)

arch/m68k/lib/umodsi3.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ General Public License for more details. */
3232
Some of this code comes from MINIX, via the folks at ericsson.
3333
D. V. Henkel-Wallace ([email protected]) Fete Bastille, 1992
3434
*/
35-
35+
#include <asm/export.h>
3636
/* These are predefined by new versions of GNU cpp. */
3737

3838
#ifndef __USER_LABEL_PREFIX__
@@ -105,4 +105,4 @@ SYM (__umodsi3):
105105
subl d0, d1 /* d1 = a - (a/b)*b */
106106
movel d1, d0
107107
rts
108-
108+
EXPORT_SYMBOL(__umodsi3)

0 commit comments

Comments
 (0)