Skip to content

Commit 9259e15

Browse files
masahir0ytsbogend
authored andcommitted
mips: 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> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
1 parent 122b159 commit 9259e15

File tree

11 files changed

+11
-11
lines changed

11 files changed

+11
-11
lines changed

arch/mips/cavium-octeon/octeon-memcpy.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
* Mnemonic names for arguments to memcpy/__copy_user
1414
*/
1515

16+
#include <linux/export.h>
1617
#include <asm/asm.h>
1718
#include <asm/asm-offsets.h>
18-
#include <asm/export.h>
1919
#include <asm/regdef.h>
2020

2121
#define dst a0

arch/mips/kernel/mcount.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Author: Wu Zhangjin <wuzhangjin@gmail.com>
1111
*/
1212

13-
#include <asm/export.h>
13+
#include <linux/export.h>
1414
#include <asm/regdef.h>
1515
#include <asm/stackframe.h>
1616
#include <asm/ftrace.h>

arch/mips/kernel/r2300_fpu.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
* Further modifications to make this work:
1212
* Copyright (c) 1998 Harald Koerfgen
1313
*/
14+
#include <linux/export.h>
1415
#include <asm/asm.h>
1516
#include <asm/asmmacro.h>
1617
#include <asm/errno.h>
17-
#include <asm/export.h>
1818
#include <asm/fpregdef.h>
1919
#include <asm/mipsregs.h>
2020
#include <asm/asm-offsets.h>

arch/mips/kernel/r4k_fpu.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
* Copyright (C) 2000 MIPS Technologies, Inc.
1313
* Copyright (C) 1999, 2001 Silicon Graphics, Inc.
1414
*/
15+
#include <linux/export.h>
1516
#include <asm/asm.h>
1617
#include <asm/asmmacro.h>
1718
#include <asm/errno.h>
18-
#include <asm/export.h>
1919
#include <asm/fpregdef.h>
2020
#include <asm/mipsregs.h>
2121
#include <asm/asm-offsets.h>

arch/mips/lib/csum_partial.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
* Copyright (C) 2014 Imagination Technologies Ltd.
1212
*/
1313
#include <linux/errno.h>
14+
#include <linux/export.h>
1415
#include <asm/asm.h>
1516
#include <asm/asm-offsets.h>
16-
#include <asm/export.h>
1717
#include <asm/regdef.h>
1818

1919
#ifdef CONFIG_64BIT

arch/mips/lib/memcpy.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
#undef CONFIG_CPU_HAS_PREFETCH
3333
#endif
3434

35+
#include <linux/export.h>
3536
#include <asm/asm.h>
3637
#include <asm/asm-offsets.h>
37-
#include <asm/export.h>
3838
#include <asm/regdef.h>
3939

4040
#define dst a0

arch/mips/lib/memset.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
* Copyright (C) 2007 by Maciej W. Rozycki
99
* Copyright (C) 2011, 2012 MIPS Technologies, Inc.
1010
*/
11+
#include <linux/export.h>
1112
#include <asm/asm.h>
1213
#include <asm/asm-offsets.h>
13-
#include <asm/export.h>
1414
#include <asm/regdef.h>
1515

1616
#if LONGSIZE == 4

arch/mips/lib/strncpy_user.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* Copyright (C) 2011 MIPS Technologies, Inc.
88
*/
99
#include <linux/errno.h>
10+
#include <linux/export.h>
1011
#include <asm/asm.h>
1112
#include <asm/asm-offsets.h>
12-
#include <asm/export.h>
1313
#include <asm/regdef.h>
1414

1515
#define EX(insn,reg,addr,handler) \

arch/mips/lib/strnlen_user.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
* Copyright (c) 1996, 1998, 1999, 2004 by Ralf Baechle
77
* Copyright (c) 1999 Silicon Graphics, Inc.
88
*/
9+
#include <linux/export.h>
910
#include <asm/asm.h>
1011
#include <asm/asm-offsets.h>
11-
#include <asm/export.h>
1212
#include <asm/regdef.h>
1313

1414
#define EX(insn,reg,addr,handler) \

arch/mips/mm/page-funcs.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* Copyright (C) 2012 MIPS Technologies, Inc.
99
* Copyright (C) 2012 Ralf Baechle <ralf@linux-mips.org>
1010
*/
11+
#include <linux/export.h>
1112
#include <asm/asm.h>
12-
#include <asm/export.h>
1313
#include <asm/regdef.h>
1414

1515
#ifdef CONFIG_SIBYTE_DMA_PAGEOPS

0 commit comments

Comments
 (0)