* [PATCH 1/2] m68k: replace #include <asm/export.h> with #include <linux/export.h>
@ 2023-08-07 15:36 Masahiro Yamada
2023-08-07 15:36 ` [PATCH 2/2] m68k: remove <asm/export.h> Masahiro Yamada
2023-08-16 14:55 ` [PATCH 1/2] m68k: replace #include <asm/export.h> with #include <linux/export.h> Geert Uytterhoeven
0 siblings, 2 replies; 4+ messages in thread
From: Masahiro Yamada @ 2023-08-07 15:36 UTC (permalink / raw
To: Geert Uytterhoeven, linux-m68k; +Cc: linux-kernel, linux-arch, Masahiro Yamada
Commit ddb5cdbafaaa ("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>
---
arch/m68k/lib/divsi3.S | 2 +-
arch/m68k/lib/modsi3.S | 2 +-
arch/m68k/lib/mulsi3.S | 2 +-
arch/m68k/lib/udivsi3.S | 2 +-
arch/m68k/lib/umodsi3.S | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/m68k/lib/divsi3.S b/arch/m68k/lib/divsi3.S
index 3a2143f51631..62787b4333e7 100644
--- a/arch/m68k/lib/divsi3.S
+++ b/arch/m68k/lib/divsi3.S
@@ -33,7 +33,7 @@ General Public License for more details. */
D. V. Henkel-Wallace (gumby@cygnus.com) Fete Bastille, 1992
*/
-#include <asm/export.h>
+#include <linux/export.h>
/* These are predefined by new versions of GNU cpp. */
diff --git a/arch/m68k/lib/modsi3.S b/arch/m68k/lib/modsi3.S
index 1c967649a4e0..1bcb742d0b76 100644
--- a/arch/m68k/lib/modsi3.S
+++ b/arch/m68k/lib/modsi3.S
@@ -33,7 +33,7 @@ General Public License for more details. */
D. V. Henkel-Wallace (gumby@cygnus.com) Fete Bastille, 1992
*/
-#include <asm/export.h>
+#include <linux/export.h>
/* These are predefined by new versions of GNU cpp. */
diff --git a/arch/m68k/lib/mulsi3.S b/arch/m68k/lib/mulsi3.S
index 855675e69a8a..c2853248249e 100644
--- a/arch/m68k/lib/mulsi3.S
+++ b/arch/m68k/lib/mulsi3.S
@@ -32,7 +32,7 @@ General Public License for more details. */
Some of this code comes from MINIX, via the folks at ericsson.
D. V. Henkel-Wallace (gumby@cygnus.com) Fete Bastille, 1992
*/
-#include <asm/export.h>
+#include <linux/export.h>
/* These are predefined by new versions of GNU cpp. */
#ifndef __USER_LABEL_PREFIX__
diff --git a/arch/m68k/lib/udivsi3.S b/arch/m68k/lib/udivsi3.S
index 78440ae513bf..39ad70596293 100644
--- a/arch/m68k/lib/udivsi3.S
+++ b/arch/m68k/lib/udivsi3.S
@@ -32,7 +32,7 @@ General Public License for more details. */
Some of this code comes from MINIX, via the folks at ericsson.
D. V. Henkel-Wallace (gumby@cygnus.com) Fete Bastille, 1992
*/
-#include <asm/export.h>
+#include <linux/export.h>
/* These are predefined by new versions of GNU cpp. */
#ifndef __USER_LABEL_PREFIX__
diff --git a/arch/m68k/lib/umodsi3.S b/arch/m68k/lib/umodsi3.S
index b6fd11f58948..6640eaa9eb03 100644
--- a/arch/m68k/lib/umodsi3.S
+++ b/arch/m68k/lib/umodsi3.S
@@ -32,7 +32,7 @@ General Public License for more details. */
Some of this code comes from MINIX, via the folks at ericsson.
D. V. Henkel-Wallace (gumby@cygnus.com) Fete Bastille, 1992
*/
-#include <asm/export.h>
+#include <linux/export.h>
/* These are predefined by new versions of GNU cpp. */
#ifndef __USER_LABEL_PREFIX__
--
2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] m68k: remove <asm/export.h>
2023-08-07 15:36 [PATCH 1/2] m68k: replace #include <asm/export.h> with #include <linux/export.h> Masahiro Yamada
@ 2023-08-07 15:36 ` Masahiro Yamada
2023-08-16 14:55 ` Geert Uytterhoeven
2023-08-16 14:55 ` [PATCH 1/2] m68k: replace #include <asm/export.h> with #include <linux/export.h> Geert Uytterhoeven
1 sibling, 1 reply; 4+ messages in thread
From: Masahiro Yamada @ 2023-08-07 15:36 UTC (permalink / raw
To: Geert Uytterhoeven, linux-m68k; +Cc: linux-kernel, linux-arch, Masahiro Yamada
All *.S files under arch/m68k/ have been converted to include
<linux/export.h> instead of <asm/export.h>.
Remove <asm/export.h>.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
arch/m68k/include/asm/Kbuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 1b720299deb1..0dbf9c5c6fae 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
generated-y += syscall_table.h
-generic-y += export.h
generic-y += extable.h
generic-y += kvm_para.h
generic-y += mcs_spinlock.h
--
2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] m68k: replace #include <asm/export.h> with #include <linux/export.h>
2023-08-07 15:36 [PATCH 1/2] m68k: replace #include <asm/export.h> with #include <linux/export.h> Masahiro Yamada
2023-08-07 15:36 ` [PATCH 2/2] m68k: remove <asm/export.h> Masahiro Yamada
@ 2023-08-16 14:55 ` Geert Uytterhoeven
1 sibling, 0 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2023-08-16 14:55 UTC (permalink / raw
To: Masahiro Yamada; +Cc: linux-m68k, linux-kernel, linux-arch
On Mon, Aug 7, 2023 at 5:37 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
> Commit ddb5cdbafaaa ("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: Geert Uytterhoeven <geert@linux-m68k.org>
i.e. will queue in the m68k for-v6.6 branch.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] m68k: remove <asm/export.h>
2023-08-07 15:36 ` [PATCH 2/2] m68k: remove <asm/export.h> Masahiro Yamada
@ 2023-08-16 14:55 ` Geert Uytterhoeven
0 siblings, 0 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2023-08-16 14:55 UTC (permalink / raw
To: Masahiro Yamada; +Cc: linux-m68k, linux-kernel, linux-arch
On Mon, Aug 7, 2023 at 5:37 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
> All *.S files under arch/m68k/ have been converted to include
> <linux/export.h> instead of <asm/export.h>.
>
> Remove <asm/export.h>.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
i.e. will queue in the m68k for-v6.6 branch.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-08-16 14:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-07 15:36 [PATCH 1/2] m68k: replace #include <asm/export.h> with #include <linux/export.h> Masahiro Yamada
2023-08-07 15:36 ` [PATCH 2/2] m68k: remove <asm/export.h> Masahiro Yamada
2023-08-16 14:55 ` Geert Uytterhoeven
2023-08-16 14:55 ` [PATCH 1/2] m68k: replace #include <asm/export.h> with #include <linux/export.h> Geert Uytterhoeven
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).