Skip to contentSkip to conversation

m68k: replace #include <asm/export.h> with #include <linux/export.h>

PATCH In review Masahiro Yamada 2 participants 4 messages Aug 7, 2023 – Aug 16, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 m68k: replace #include <asm/export.h> with #include <linux/export.h>

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.

---

 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(-)
arch/m68k/lib/divsi3.S +1 -1
index 3a2143f51631..62787b4333e7 100644
@@ -33,7 +33,7 @@ General Public License for more details. */
    D. V. Henkel-Wallace ([email protected]) Fete Bastille, 1992
 */
 
-#include <asm/export.h>
+#include <linux/export.h>
 
 /* These are predefined by new versions of GNU cpp.  */
 
arch/m68k/lib/modsi3.S +1 -1
index 1c967649a4e0..1bcb742d0b76 100644
@@ -33,7 +33,7 @@ General Public License for more details. */
    D. V. Henkel-Wallace ([email protected]) Fete Bastille, 1992
 */
 
-#include <asm/export.h>
+#include <linux/export.h>
 
 /* These are predefined by new versions of GNU cpp.  */
 
arch/m68k/lib/mulsi3.S +1 -1
index 855675e69a8a..c2853248249e 100644
@@ -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 ([email protected]) Fete Bastille, 1992
 */
-#include <asm/export.h>
+#include <linux/export.h>
 /* These are predefined by new versions of GNU cpp.  */
 
 #ifndef __USER_LABEL_PREFIX__
arch/m68k/lib/udivsi3.S +1 -1
index 78440ae513bf..39ad70596293 100644
@@ -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 ([email protected]) Fete Bastille, 1992
 */
-#include <asm/export.h>
+#include <linux/export.h>
 /* These are predefined by new versions of GNU cpp.  */
 
 #ifndef __USER_LABEL_PREFIX__
arch/m68k/lib/umodsi3.S +1 -1
index b6fd11f58948..6640eaa9eb03 100644
@@ -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 ([email protected]) Fete Bastille, 1992
 */
-#include <asm/export.h>
+#include <linux/export.h>
 /* These are predefined by new versions of GNU cpp.  */
 
 #ifndef __USER_LABEL_PREFIX__
Signature · 1 line
2.39.2
#1 lore raw

PATCH 2/2 m68k: remove <asm/export.h>

All *.S files under arch/m68k/ have been converted to include <linux/export.h> instead of <asm/export.h>.

Remove <asm/export.h>.

---

 arch/m68k/include/asm/Kbuild | 1 -
 1 file changed, 1 deletion(-)
arch/m68k/include/asm/Kbuild +0 -1
index 1b720299deb1..0dbf9c5c6fae 100644
@@ -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
Signature · 1 line
2.39.2
maintainer Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] m68k: remove <asm/export.h>

Quoted 6 lines · 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>.

i.e. will queue in the m68k for-v6.6 branch.

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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
maintainer Reviewed-by on v1 1/2
#3 lore raw
In reply to Masahiro Yamada
Quoted 9 lines · 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.

i.e. will queue in the m68k for-v6.6 branch.

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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