diff mbox series

[2/2] riscv: replace <asm-generic/export.h> with <linux/export.h>

Message ID 20231126151739.1557369-2-masahiroy@kernel.org
State New
Headers
Series [1/2] riscv: remove unneeded #include <asm-generic/export.h> |

Commit Message

Masahiro Yamada Nov. 26, 2023, 3:17 p.m. UTC 
  Commit ddb5cdbafaaa ("kbuild: generate KSYMTAB entries by modpost")
deprecated <asm-generic/export.h>, which is now a wrapper of
<linux/export.h>.

Replace #include <asm-generic/export.h> with #include <linux/export.h>.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 arch/riscv/kernel/mcount.S  | 2 +-
 arch/riscv/lib/clear_page.S | 2 +-
 arch/riscv/lib/tishift.S    | 2 +-
 arch/riscv/lib/uaccess.S    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Comments

Emil Renner Berthing Nov. 28, 2023, 12:20 p.m. UTC | #1 
Masahiro Yamada wrote:
> Commit ddb5cdbafaaa ("kbuild: generate KSYMTAB entries by modpost")
> deprecated <asm-generic/export.h>, which is now a wrapper of
> <linux/export.h>.
>
> Replace #include <asm-generic/export.h> with #include <linux/export.h>.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

Reviewed-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>

Thanks!
/Emil
diff mbox series

Patch

diff --git a/arch/riscv/kernel/mcount.S b/arch/riscv/kernel/mcount.S
index b4dd9ed6849e..f46db726e42e 100644
--- a/arch/riscv/kernel/mcount.S
+++ b/arch/riscv/kernel/mcount.S
@@ -1,6 +1,7 @@ 
 /* SPDX-License-Identifier: GPL-2.0 */
 /* Copyright (C) 2017 Andes Technology Corporation */
 
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/linkage.h>
 #include <linux/cfi_types.h>
@@ -9,7 +10,6 @@ 
 #include <asm/unistd.h>
 #include <asm/thread_info.h>
 #include <asm/asm-offsets.h>
-#include <asm-generic/export.h>
 #include <asm/ftrace.h>
 
 	.text
diff --git a/arch/riscv/lib/clear_page.S b/arch/riscv/lib/clear_page.S
index b22de1231144..fe07ce70a619 100644
--- a/arch/riscv/lib/clear_page.S
+++ b/arch/riscv/lib/clear_page.S
@@ -3,10 +3,10 @@ 
  * Copyright (c) 2023 Ventana Micro Systems Inc.
  */
 
+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/asm.h>
 #include <asm/alternative-macros.h>
-#include <asm-generic/export.h>
 #include <asm/hwcap.h>
 #include <asm/insn-def.h>
 #include <asm/page.h>
diff --git a/arch/riscv/lib/tishift.S b/arch/riscv/lib/tishift.S
index ef90075c4b0a..04f858afafe8 100644
--- a/arch/riscv/lib/tishift.S
+++ b/arch/riscv/lib/tishift.S
@@ -3,8 +3,8 @@ 
  * Copyright (C) 2018 Free Software Foundation, Inc.
  */
 
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm-generic/export.h>
 
 SYM_FUNC_START(__lshrti3)
 	beqz	a2, .L1
diff --git a/arch/riscv/lib/uaccess.S b/arch/riscv/lib/uaccess.S
index 3ab438f30d13..9eca131dc555 100644
--- a/arch/riscv/lib/uaccess.S
+++ b/arch/riscv/lib/uaccess.S
@@ -1,5 +1,5 @@ 
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm-generic/export.h>
 #include <asm/asm.h>
 #include <asm/asm-extable.h>
 #include <asm/csr.h>