Skip to content

Commit 711f5df

Browse files
author
Al Viro
committed
s390: move exports to definitions
Acked-by: Heiko Carstens <[email protected]> Signed-off-by: Al Viro <[email protected]>
1 parent d13ffb5 commit 711f5df

File tree

6 files changed

+14
-16
lines changed

6 files changed

+14
-16
lines changed

arch/s390/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22

33
generic-y += clkdev.h
4+
generic-y += export.h
45
generic-y += irq_work.h
56
generic-y += mcs_spinlock.h
67
generic-y += mm-arch-hooks.h

arch/s390/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ obj-y += entry.o reipl.o relocate_kernel.o
5858

5959
extra-y += head.o head64.o vmlinux.lds
6060

61-
obj-$(CONFIG_MODULES) += s390_ksyms.o module.o
61+
obj-$(CONFIG_MODULES) += module.o
6262
obj-$(CONFIG_SMP) += smp.o
6363
obj-$(CONFIG_SCHED_TOPOLOGY) += topology.o
6464
obj-$(CONFIG_HIBERNATION) += suspend.o swsusp.o

arch/s390/kernel/entry.S

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <asm/vx-insn.h>
2424
#include <asm/setup.h>
2525
#include <asm/nmi.h>
26+
#include <asm/export.h>
2627

2728
__PT_R0 = __PT_GPRS
2829
__PT_R1 = __PT_GPRS + 8
@@ -259,6 +260,8 @@ sie_exit:
259260

260261
EX_TABLE(.Lrewind_pad,.Lsie_fault)
261262
EX_TABLE(sie_exit,.Lsie_fault)
263+
EXPORT_SYMBOL(sie64a)
264+
EXPORT_SYMBOL(sie_exit)
262265
#endif
263266

264267
/*
@@ -825,6 +828,9 @@ ENTRY(save_fpu_regs)
825828
oi __LC_CPU_FLAGS+7,_CIF_FPU
826829
br %r14
827830
.Lsave_fpu_regs_end:
831+
#if IS_ENABLED(CONFIG_KVM)
832+
EXPORT_SYMBOL(save_fpu_regs)
833+
#endif
828834

829835
/*
830836
* Load floating-point controls and floating-point or vector registers.

arch/s390/kernel/mcount.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <asm/asm-offsets.h>
1010
#include <asm/ftrace.h>
1111
#include <asm/ptrace.h>
12+
#include <asm/export.h>
1213

1314
.section .kprobes.text, "ax"
1415

@@ -23,6 +24,8 @@ ENTRY(ftrace_stub)
2324
ENTRY(_mcount)
2425
br %r14
2526

27+
EXPORT_SYMBOL(_mcount)
28+
2629
ENTRY(ftrace_caller)
2730
.globl ftrace_regs_caller
2831
.set ftrace_regs_caller,ftrace_caller

arch/s390/kernel/s390_ksyms.c

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

arch/s390/lib/mem.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66

77
#include <linux/linkage.h>
8+
#include <asm/export.h>
89

910
/*
1011
* memset implementation
@@ -60,6 +61,7 @@ ENTRY(memset)
6061
xc 0(1,%r1),0(%r1)
6162
.Lmemset_mvc:
6263
mvc 1(1,%r1),0(%r1)
64+
EXPORT_SYMBOL(memset)
6365

6466
/*
6567
* memcpy implementation
@@ -86,3 +88,4 @@ ENTRY(memcpy)
8688
j .Lmemcpy_rest
8789
.Lmemcpy_mvc:
8890
mvc 0(1,%r1),0(%r3)
91+
EXPORT_SYMBOL(memcpy)

0 commit comments

Comments
 (0)