Skip to content

Commit 4cdb71b

Browse files
committed
sparc: replace #include <asm/export.h> with #include <linux/export.h>
Commit ddb5cdb ("kbuild: generate KSYMTAB entries by modpost") deprecated <asm/export.h>, which is now a wrapper of <linux/export.h>. Replace #include <asm/export.h> with #include <linux/export.h>. After all the <asm/export.h> lines are converted, <asm/export.h> and <asm-generic/export.h> will be removed. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Acked-by: Sam Ravnborg <sam@ravnborg.org>
1 parent 1fdd729 commit 4cdb71b

39 files changed

Lines changed: 40 additions & 39 deletions

arch/sparc/kernel/entry.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
* Copyright (C) 1997 Anton Blanchard (anton@progsoc.uts.edu.au)
99
*/
1010

11+
#include <linux/export.h>
1112
#include <linux/linkage.h>
1213
#include <linux/errno.h>
1314
#include <linux/pgtable.h>
@@ -30,7 +31,6 @@
3031
#include <asm/unistd.h>
3132

3233
#include <asm/asmmacro.h>
33-
#include <asm/export.h>
3434

3535
#define curptr g6
3636

arch/sparc/kernel/head_32.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* CompactPCI platform by Eric Brower, 1999.
1212
*/
1313

14+
#include <linux/export.h>
1415
#include <linux/version.h>
1516
#include <linux/init.h>
1617

@@ -25,7 +26,6 @@
2526
#include <asm/thread_info.h> /* TI_UWINMASK */
2627
#include <asm/errno.h>
2728
#include <asm/pgtable.h> /* PGDIR_SHIFT */
28-
#include <asm/export.h>
2929

3030
.data
3131
/* The following are used with the prom_vector node-ops to figure out

arch/sparc/kernel/head_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include <linux/version.h>
1111
#include <linux/errno.h>
12+
#include <linux/export.h>
1213
#include <linux/threads.h>
1314
#include <linux/init.h>
1415
#include <linux/linkage.h>
@@ -33,7 +34,6 @@
3334
#include <asm/estate.h>
3435
#include <asm/sfafsr.h>
3536
#include <asm/unistd.h>
36-
#include <asm/export.h>
3737

3838
/* This section from from _start to sparc64_boot_end should fit into
3939
* 0x0000000000404000 to 0x0000000000408000.

arch/sparc/lib/U1memcpy.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
*/
77

88
#ifdef __KERNEL__
9+
#include <linux/export.h>
910
#include <linux/linkage.h>
1011
#include <asm/visasm.h>
1112
#include <asm/asi.h>
12-
#include <asm/export.h>
1313
#define GLOBAL_SPARE g7
1414
#else
1515
#define GLOBAL_SPARE g5

arch/sparc/lib/VISsave.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
* Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz)
88
*/
99

10+
#include <linux/export.h>
1011
#include <linux/linkage.h>
1112

1213
#include <asm/asi.h>
1314
#include <asm/page.h>
1415
#include <asm/ptrace.h>
1516
#include <asm/visasm.h>
1617
#include <asm/thread_info.h>
17-
#include <asm/export.h>
1818

1919
/* On entry: %o5=current FPRS value, %g7 is callers address */
2020
/* May clobber %o5, %g1, %g2, %g3, %g7, %icc, %xcc */

arch/sparc/lib/ashldi3.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
* Copyright (C) 1999 David S. Miller (davem@redhat.com)
77
*/
88

9+
#include <linux/export.h>
910
#include <linux/linkage.h>
10-
#include <asm/export.h>
1111

1212
.text
1313
ENTRY(__ashldi3)

arch/sparc/lib/ashrdi3.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
77
*/
88

9+
#include <linux/export.h>
910
#include <linux/linkage.h>
10-
#include <asm/export.h>
1111

1212
.text
1313
ENTRY(__ashrdi3)

arch/sparc/lib/atomic_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* Copyright (C) 1999, 2007 2012 David S. Miller (davem@davemloft.net)
55
*/
66

7+
#include <linux/export.h>
78
#include <linux/linkage.h>
89
#include <asm/asi.h>
910
#include <asm/backoff.h>
10-
#include <asm/export.h>
1111

1212
.text
1313

arch/sparc/lib/bitops.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* Copyright (C) 2000, 2007 David S. Miller (davem@davemloft.net)
55
*/
66

7+
#include <linux/export.h>
78
#include <linux/linkage.h>
89
#include <asm/asi.h>
910
#include <asm/backoff.h>
10-
#include <asm/export.h>
1111

1212
.text
1313

arch/sparc/lib/blockops.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
* Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
66
*/
77

8+
#include <linux/export.h>
89
#include <linux/linkage.h>
910
#include <asm/page.h>
10-
#include <asm/export.h>
1111

1212
/* Zero out 64 bytes of memory at (buf + offset).
1313
* Assumes %g1 contains zero.

0 commit comments

Comments
 (0)