2023-11-26 15:18:30

by Masahiro Yamada

Subject: [PATCH 1/2] riscv: remove unneeded #include <asm-generic/export.h>

There is no EXPORT_SYMBOL() line there, hence
"#include <asm-generic/export.h>" is unneeded.

Signed-off-by: Masahiro Yamada <[email protected]>
---

arch/riscv/kernel/mcount-dyn.S | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/riscv/kernel/mcount-dyn.S b/arch/riscv/kernel/mcount-dyn.S
index 58dd96a2a153..952233aa273a 100644
--- a/arch/riscv/kernel/mcount-dyn.S
+++ b/arch/riscv/kernel/mcount-dyn.S
@@ -8,7 +8,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
--
2.40.1

2023-11-26 15:18:34

by Masahiro Yamada

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

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 <[email protected]>
---

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(-)

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>
--
2.40.1

2023-11-28 12:19:38

by Emil Renner Berthing

Subject: Re: [PATCH 1/2] riscv: remove unneeded #include <asm-generic/export.h>

Masahiro Yamada wrote:
> There is no EXPORT_SYMBOL() line there, hence
> "#include <asm-generic/export.h>" is unneeded.
>
> Signed-off-by: Masahiro Yamada <[email protected]>

Reviewed-by: Emil Renner Berthing <[email protected]>

Thanks!
/Emil

> ---
>
> arch/riscv/kernel/mcount-dyn.S | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/riscv/kernel/mcount-dyn.S b/arch/riscv/kernel/mcount-dyn.S
> index 58dd96a2a153..952233aa273a 100644
> --- a/arch/riscv/kernel/mcount-dyn.S
> +++ b/arch/riscv/kernel/mcount-dyn.S
> @@ -8,7 +8,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
> --
> 2.40.1
>
>
> _______________________________________________
> linux-riscv mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-riscv