Merge tag 'kbuild-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild updates from Masahiro Yamada: - Enable -Wenum-conversion warning option - Refactor the rpm-pkg target - Fix scripts/setlocalversion to consider annotated tags for rt-kernel - Add a jump key feature for the search menu of 'make nconfig' - Support Qt6 for 'make xconfig' - Enable -Wformat-overflow, -Wformat-truncation, -Wstringop-overflow, and -Wrestrict warnings for W=1 builds - Replace <asm/export.h> with <linux/export.h> for alpha, ia64, and sparc - Support DEB_BUILD_OPTIONS=parallel=N for the debian source package - Refactor scripts/Makefile.modinst and fix some modules_sign issues - Add a new Kconfig env variable to warn symbols that are not defined anywhere - Show help messages of config fragments in 'make help' * tag 'kbuild-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (62 commits) kconfig: fix possible buffer overflow kbuild: Show marked Kconfig fragments in "help" kconfig: add warn-unknown-symbols sanity check kbuild: dummy-tools: make MPROFILE_KERNEL checks work on BE Documentation/llvm: refresh docs modpost: Skip .llvm.call-graph-profile section check kbuild: support modules_sign for external modules as well kbuild: support 'make modules_sign' with CONFIG_MODULE_SIG_ALL=n kbuild: move more module installation code to scripts/Makefile.modinst kbuild: reduce the number of mkdir calls during modules_install kbuild: remove $(MODLIB)/source symlink kbuild: move depmod rule to scripts/Makefile.modinst kbuild: add modules_sign to no-{compiler,sync-config}-targets kbuild: do not run depmod for 'make modules_sign' kbuild: deb-pkg: support DEB_BUILD_OPTIONS=parallel=N in debian/rules alpha: remove <asm/export.h> alpha: replace #include <asm/export.h> with #include <linux/export.h> ia64: remove <asm/export.h> ia64: replace #include <asm/export.h> with #include <linux/export.h> sparc: remove <asm/export.h> ...

Merge tag 'kbuild-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild updates from Masahiro Yamada: - Enable -Wenum-conversion warning option - Refactor the rpm-pkg target - Fix scripts/setlocalversion to consider annotated tags for rt-kernel - Add a jump key feature for the search menu of 'make nconfig' - Support Qt6 for 'make xconfig' - Enable -Wformat-overflow, -Wformat-truncation, -Wstringop-overflow, and -Wrestrict warnings for W=1 builds - Replace <asm/export.h> with <linux/export.h> for alpha, ia64, and sparc - Support DEB_BUILD_OPTIONS=parallel=N for the debian source package - Refactor scripts/Makefile.modinst and fix some modules_sign issues - Add a new Kconfig env variable to warn symbols that are not defined anywhere - Show help messages of config fragments in 'make help' * tag 'kbuild-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (62 commits) kconfig: fix possible buffer overflow kbuild: Show marked Kconfig fragments in "help" kconfig: add warn-unknown-symbols sanity check kbuild: dummy-tools: make MPROFILE_KERNEL checks work on BE Documentation/llvm: refresh docs modpost: Skip .llvm.call-graph-profile section check kbuild: support modules_sign for external modules as well kbuild: support 'make modules_sign' with CONFIG_MODULE_SIG_ALL=n kbuild: move more module installation code to scripts/Makefile.modinst kbuild: reduce the number of mkdir calls during modules_install kbuild: remove $(MODLIB)/source symlink kbuild: move depmod rule to scripts/Makefile.modinst kbuild: add modules_sign to no-{compiler,sync-config}-targets kbuild: do not run depmod for 'make modules_sign' kbuild: deb-pkg: support DEB_BUILD_OPTIONS=parallel=N in debian/rules alpha: remove <asm/export.h> alpha: replace #include <asm/export.h> with #include <linux/export.h> ia64: remove <asm/export.h> ia64: replace #include <asm/export.h> with #include <linux/export.h> sparc: remove <asm/export.h> ...
61401a87 · Linus Torvalds · 5eea5820 · a3b7039b · 61401a87 · 61401a87
Commit 61401a87 authored Sep 05, 2023 by Linus Torvalds
149 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -74,7 +74,7 @@ modules.order
 #
 # RPM spec file (make rpm-pkg)
 #
-/*.spec
+/kernel.spec
 /rpmbuild/
 #

--- a/Documentation/kbuild/kconfig.rst
+++ b/Documentation/kbuild/kconfig.rst
@@ -56,6 +56,15 @@ KCONFIG_OVERWRITECONFIG
 If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not
 break symlinks when .config is a symlink to somewhere else.
+KCONFIG_WARN_UNKNOWN_SYMBOLS
+----------------------------
+This environment variable makes Kconfig warn about all unrecognized
+symbols in the config input.
+KCONFIG_WERROR
+--------------
+If set, Kconfig treats warnings as errors.
 `CONFIG_`
 ---------
 If you set `CONFIG_` in the environment, Kconfig will prefix all symbols
@@ -212,6 +221,10 @@ Searching in menuconfig:
 	first (and in alphabetical order), then come all other symbols,
 	sorted in alphabetical order.
+	In this menu, pressing the key in the (#) prefix will jump
+	directly to that location. You will be returned to the current
+	search results after exiting this new menu.
 ----------------------------------------------------------------------
 User interface options for 'menuconfig'
@@ -264,6 +277,10 @@ Searching in nconfig:
 	F8 (SymSearch) searches the configuration symbols for the
 	given string or regular expression (regex).
+	In the SymSearch, pressing the key in the (#) prefix will
+	jump directly to that location. You will be returned to the
+	current search results after exiting this new menu.
 NCONFIG_MODE
 ------------
 This mode shows all sub-menus in one large tree.

--- a/Documentation/kbuild/llvm.rst
+++ b/Documentation/kbuild/llvm.rst
@@ -25,50 +25,38 @@ objects <https://www.aosabook.org/en/llvm.html>`_. Clang is a front-end to LLVM
 that supports C and the GNU C extensions required by the kernel, and is
 pronounced "klang," not "see-lang."
-Clang
+Building with LLVM
-----
+------------------
-The compiler used can be swapped out via ``CC=`` command line argument to ``make``.
-``CC=`` should be set when selecting a config and during a build. ::
-	make CC=clang defconfig
-	make CC=clang
-Cross Compiling
+Invoke ``make`` via::
---------------
-A single Clang compiler binary will typically contain all supported backends,
+	make LLVM=1
-which can help simplify cross compiling. ::
-	make ARCH=arm64 CC=clang CROSS_COMPILE=aarch64-linux-gnu-
-``CROSS_COMPILE`` is not used to prefix the Clang compiler binary, instead
+to compile for the host target. For cross compiling::
-``CROSS_COMPILE`` is used to set a command line flag: ``--target=<triple>``. For
-example: ::
-	clang --target=aarch64-linux-gnu foo.c
+	make LLVM=1 ARCH=arm64
-LLVM Utilities
+The LLVM= argument
--------------
+------------------
-LLVM has substitutes for GNU binutils utilities. They can be enabled individually.
+LLVM has substitutes for GNU binutils utilities. They can be enabled
-The full list of supported make variables::
+individually. The full list of supported make variables::
 	make CC=clang LD=ld.lld AR=llvm-ar NM=llvm-nm STRIP=llvm-strip \
 	  OBJCOPY=llvm-objcopy OBJDUMP=llvm-objdump READELF=llvm-readelf \
 	  HOSTCC=clang HOSTCXX=clang++ HOSTAR=llvm-ar HOSTLD=ld.lld
-To simplify the above command, Kbuild supports the ``LLVM`` variable::
+``LLVM=1`` expands to the above.
-	make LLVM=1
 If your LLVM tools are not available in your PATH, you can supply their
 location using the LLVM variable with a trailing slash::
 	make LLVM=/path/to/llvm/
-which will use ``/path/to/llvm/clang``, ``/path/to/llvm/ld.lld``, etc.
+which will use ``/path/to/llvm/clang``, ``/path/to/llvm/ld.lld``, etc. The
+following may also be used::
+	PATH=/path/to/llvm:$PATH make LLVM=1
 If your LLVM tools have a version suffix and you want to test with that
 explicit version rather than the unsuffixed executables like ``LLVM=1``, you
@@ -78,31 +66,72 @@ can pass the suffix using the ``LLVM`` variable::
 which will use ``clang-14``, ``ld.lld-14``, etc.
+To support combinations of out of tree paths with version suffixes, we
+recommend::
+	PATH=/path/to/llvm/:$PATH make LLVM=-14
 ``LLVM=0`` is not the same as omitting ``LLVM`` altogether, it will behave like
-``LLVM=1``. If you only wish to use certain LLVM utilities, use their respective
+``LLVM=1``. If you only wish to use certain LLVM utilities, use their
-make variables.
+respective make variables.
+The same value used for ``LLVM=`` should be set for each invocation of ``make``
+if configuring and building via distinct commands. ``LLVM=`` should also be set
+as an environment variable when running scripts that will eventually run
+``make``.
-The integrated assembler is enabled by default. You can pass ``LLVM_IAS=0`` to
+Cross Compiling
-disable it.
+---------------
-Omitting CROSS_COMPILE
+A single Clang compiler binary (and corresponding LLVM utilities) will
+typically contain all supported back ends, which can help simplify cross
+compiling especially when ``LLVM=1`` is used. If you use only LLVM tools,
+``CROSS_COMPILE`` or target-triple-prefixes become unnecessary. Example::
+	make LLVM=1 ARCH=arm64
+As an example of mixing LLVM and GNU utilities, for a target like ``ARCH=s390``
+which does not yet have ``ld.lld`` or ``llvm-objcopy`` support, you could
+invoke ``make`` via::
+	make LLVM=1 ARCH=s390 LD=s390x-linux-gnu-ld.bfd \
+	  OBJCOPY=s390x-linux-gnu-objcopy
+This example will invoke ``s390x-linux-gnu-ld.bfd`` as the linker and
+``s390x-linux-gnu-objcopy``, so ensure those are reachable in your ``$PATH``.
+``CROSS_COMPILE`` is not used to prefix the Clang compiler binary (or
+corresponding LLVM utilities) as is the case for GNU utilities when ``LLVM=1``
+is not set.
+The LLVM_IAS= argument
 ----------------------
-As explained above, ``CROSS_COMPILE`` is used to set ``--target=<triple>``.
+Clang can assemble assembler code. You can pass ``LLVM_IAS=0`` to disable this
+behavior and have Clang invoke the corresponding non-integrated assembler
+instead. Example::
+	make LLVM=1 LLVM_IAS=0
+``CROSS_COMPILE`` is necessary when cross compiling and ``LLVM_IAS=0``
+is used in order to set ``--prefix=`` for the compiler to find the
+corresponding non-integrated assembler (typically, you don't want to use the
+system assembler when targeting another architecture). Example::
-If ``CROSS_COMPILE`` is not specified, the ``--target=<triple>`` is inferred
+	make LLVM=1 ARCH=arm LLVM_IAS=0 CROSS_COMPILE=arm-linux-gnueabi-
-from ``ARCH``.
-That means if you use only LLVM tools, ``CROSS_COMPILE`` becomes unnecessary.
-For example, to cross-compile the arm64 kernel::
+Ccache
+------
-	make ARCH=arm64 LLVM=1
+``ccache`` can be used with ``clang`` to improve subsequent builds, (though
+KBUILD_BUILD_TIMESTAMP_ should be set to a deterministic value between builds
+in order to avoid 100% cache misses, see Reproducible_builds_ for more info):
-If ``LLVM_IAS=0`` is specified, ``CROSS_COMPILE`` is also used to derive
+	KBUILD_BUILD_TIMESTAMP='' make LLVM=1 CC="ccache clang"
-``--prefix=<path>`` to search for the GNU assembler and linker. ::
-	make ARCH=arm64 LLVM=1 LLVM_IAS=0 CROSS_COMPILE=aarch64-linux-gnu-
+.. _KBUILD_BUILD_TIMESTAMP: kbuild.html#kbuild-build-timestamp
+.. _Reproducible_builds: reproducible-builds.html#timestamps
 Supported Architectures
 -----------------------
@@ -135,14 +164,17 @@ yet. Bug reports are always welcome at the issue tracker below!
   * - hexagon
     - Maintained
     - ``LLVM=1``
+   * - loongarch
+     - Maintained
+     - ``LLVM=1``
   * - mips
     - Maintained
     - ``LLVM=1``
   * - powerpc
     - Maintained
-     - ``CC=clang``
+     - ``LLVM=1``
   * - riscv
-     - Maintained
+     - Supported
     - ``LLVM=1``
   * - s390
     - Maintained
@@ -171,7 +203,11 @@ Getting Help
 Getting LLVM
 -------------
-We provide prebuilt stable versions of LLVM on `kernel.org <https://kernel.org/pub/tools/llvm/>`_.
+We provide prebuilt stable versions of LLVM on `kernel.org
+<https://kernel.org/pub/tools/llvm/>`_. These have been optimized with profile
+data for building Linux kernels, which should improve kernel build times
+relative to other distributions of LLVM.
 Below are links that may be useful for building LLVM from source or procuring
 it through a distribution's package manager.

--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11382,6 +11382,7 @@ F:	scripts/dummy-tools/
 F:	scripts/mk*
 F:	scripts/mod/
 F:	scripts/package/
+F:	usr/
 KERNEL HARDENING (not covered by other areas)
 M:	Kees Cook <keescook@chromium.org>

--- a/Makefile
+++ b/Makefile
--- a/arch/alpha/include/asm/Kbuild
+++ b/arch/alpha/include/asm/Kbuild
@@ -3,6 +3,5 @@
 generated-y += syscall_table.h
 generic-y += agp.h
 generic-y += asm-offsets.h
-generic-y += export.h
 generic-y += kvm_para.h
 generic-y += mcs_spinlock.h
--- a/arch/alpha/lib/callback_srm.S
+++ b/arch/alpha/lib/callback_srm.S
@@ -3,8 +3,8 @@
 *	arch/alpha/lib/callback_srm.S
 */
+#include <linux/export.h>
 #include <asm/console.h>
-#include <asm/export.h>
 .text
 #define HWRPB_CRB_OFFSET 0xc0

--- a/arch/alpha/lib/clear_page.S
+++ b/arch/alpha/lib/clear_page.S
@@ -4,7 +4,7 @@
 *
 * Zero an entire page.
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.text
 	.align 4
 	.global clear_page

--- a/arch/alpha/lib/clear_user.S
+++ b/arch/alpha/lib/clear_user.S
@@ -10,7 +10,7 @@
 * a successful copy).  There is also some rather minor exception setup
 * stuff.
 */
-#include <asm/export.h>
+#include <linux/export.h>
 /* Allow an exception for an insn; exit if we get one.  */
 #define EX(x,y...)			\

--- a/arch/alpha/lib/copy_page.S
+++ b/arch/alpha/lib/copy_page.S
@@ -4,7 +4,7 @@
 *
 * Copy an entire page.
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.text
 	.align 4
 	.global copy_page

--- a/arch/alpha/lib/copy_user.S
+++ b/arch/alpha/lib/copy_user.S
@@ -12,7 +12,7 @@
 * exception setup stuff..
 */
-#include <asm/export.h>
+#include <linux/export.h>
 /* Allow an exception for an insn; exit if we get one.  */
 #define EXI(x,y...)			\

--- a/arch/alpha/lib/csum_ipv6_magic.S
+++ b/arch/alpha/lib/csum_ipv6_magic.S
@@ -13,7 +13,7 @@
 * added by Ivan Kokshaysky <ink@jurassic.park.msu.ru>
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.globl csum_ipv6_magic
 	.align 4
 	.ent csum_ipv6_magic

--- a/arch/alpha/lib/divide.S
+++ b/arch/alpha/lib/divide.S
@@ -46,7 +46,7 @@
 *	$28 - compare status
 */
-#include <asm/export.h>
+#include <linux/export.h>
 #define halt .long 0
 /*

--- a/arch/alpha/lib/ev6-clear_page.S
+++ b/arch/alpha/lib/ev6-clear_page.S
@@ -4,7 +4,7 @@
 *
 * Zero an entire page.
 */
-#include <asm/export.h>
+#include <linux/export.h>
        .text
        .align 4
        .global clear_page

--- a/arch/alpha/lib/ev6-clear_user.S
+++ b/arch/alpha/lib/ev6-clear_user.S
@@ -29,7 +29,7 @@
 *	want to leave a hole (and we also want to avoid repeating lots of work)
 */
-#include <asm/export.h>
+#include <linux/export.h>
 /* Allow an exception for an insn; exit if we get one.  */
 #define EX(x,y...)			\
 	99: x,##y;			\

--- a/arch/alpha/lib/ev6-copy_page.S
+++ b/arch/alpha/lib/ev6-copy_page.S
@@ -57,7 +57,7 @@
   destination pages are in the dcache, but it is my guess that this is
   less important than the dcache miss case.  */
-#include <asm/export.h>
+#include <linux/export.h>
 	.text
 	.align 4
 	.global copy_page

--- a/arch/alpha/lib/ev6-copy_user.S
+++ b/arch/alpha/lib/ev6-copy_user.S
@@ -23,7 +23,7 @@
 *	L	- lower subcluster; L0 - subcluster L0; L1 - subcluster L1
 */
-#include <asm/export.h>
+#include <linux/export.h>
 /* Allow an exception for an insn; exit if we get one.  */
 #define EXI(x,y...)			\
 	99: x,##y;			\

--- a/arch/alpha/lib/ev6-csum_ipv6_magic.S
+++ b/arch/alpha/lib/ev6-csum_ipv6_magic.S
@@ -53,7 +53,7 @@
 * may cause additional delay in rare cases (load-load replay traps).
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.globl csum_ipv6_magic
 	.align 4
 	.ent csum_ipv6_magic

--- a/arch/alpha/lib/ev6-divide.S
+++ b/arch/alpha/lib/ev6-divide.S
@@ -56,7 +56,7 @@
 * Try not to change the actual algorithm if possible for consistency.
 */
-#include <asm/export.h>
+#include <linux/export.h>
 #define halt .long 0
 /*

--- a/arch/alpha/lib/ev6-memchr.S
+++ b/arch/alpha/lib/ev6-memchr.S
@@ -28,7 +28,7 @@
 *	L	- lower subcluster; L0 - subcluster L0; L1 - subcluster L1
 * Try not to change the actual algorithm if possible for consistency.
 */
-#include <asm/export.h>
+#include <linux/export.h>
        .set noreorder
        .set noat

--- a/arch/alpha/lib/ev6-memcpy.S
+++ b/arch/alpha/lib/ev6-memcpy.S
@@ -20,7 +20,7 @@
 * Temp usage notes:
 *	$1,$2,		- scratch
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.set noreorder
 	.set noat

--- a/arch/alpha/lib/ev6-memset.S
+++ b/arch/alpha/lib/ev6-memset.S
@@ -27,7 +27,7 @@
 * as fixes will need to be made in multiple places.  The performance gain
 * is worth it.
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.set noat
 	.set noreorder
 .text

--- a/arch/alpha/lib/ev67-strcat.S
+++ b/arch/alpha/lib/ev67-strcat.S
@@ -20,7 +20,7 @@
 * string once.
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.text
 	.align 4

--- a/arch/alpha/lib/ev67-strchr.S
+++ b/arch/alpha/lib/ev67-strchr.S
@@ -16,7 +16,7 @@
 *	L	- lower subcluster; L0 - subcluster L0; L1 - subcluster L1
 * Try not to change the actual algorithm if possible for consistency.
 */
-#include <asm/export.h>
+#include <linux/export.h>
 #include <asm/regdef.h>
 	.set noreorder

--- a/arch/alpha/lib/ev67-strlen.S
+++ b/arch/alpha/lib/ev67-strlen.S
@@ -18,7 +18,7 @@
 *	U	- upper subcluster; U0 - subcluster U0; U1 - subcluster U1
 *	L	- lower subcluster; L0 - subcluster L0; L1 - subcluster L1
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.set noreorder
 	.set noat

--- a/arch/alpha/lib/ev67-strncat.S
+++ b/arch/alpha/lib/ev67-strncat.S
@@ -21,7 +21,7 @@
 * Try not to change the actual algorithm if possible for consistency.
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.text
 	.align 4

--- a/arch/alpha/lib/ev67-strrchr.S
+++ b/arch/alpha/lib/ev67-strrchr.S
@@ -19,7 +19,7 @@
 *	L	- lower subcluster; L0 - subcluster L0; L1 - subcluster L1
 */
-#include <asm/export.h>
+#include <linux/export.h>
 #include <asm/regdef.h>
 	.set noreorder

--- a/arch/alpha/lib/memchr.S
+++ b/arch/alpha/lib/memchr.S
@@ -31,7 +31,7 @@ For correctness consider that:
      - only minimum number of quadwords may be accessed
      - the third argument is an unsigned long
 */
-#include <asm/export.h>
+#include <linux/export.h>
        .set noreorder
        .set noat

--- a/arch/alpha/lib/memmove.S
+++ b/arch/alpha/lib/memmove.S
@@ -7,7 +7,7 @@
 * This is hand-massaged output from the original memcpy.c.  We defer to
 * memcpy whenever possible; the backwards copy loops are not unrolled.
 */
-#include <asm/export.h>        
+#include <linux/export.h>
 	.set noat
 	.set noreorder
 	.text

--- a/arch/alpha/lib/memset.S
+++ b/arch/alpha/lib/memset.S
@@ -14,7 +14,7 @@
 * The scheduling comments are according to the EV5 documentation (and done by 
 * hand, so they might well be incorrect, please do tell me about it..)
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.set noat
 	.set noreorder
 .text

--- a/arch/alpha/lib/strcat.S
+++ b/arch/alpha/lib/strcat.S
@@ -5,7 +5,7 @@
 *
 * Append a null-terminated string from SRC to DST.
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.text

--- a/arch/alpha/lib/strchr.S
+++ b/arch/alpha/lib/strchr.S
@@ -6,7 +6,7 @@
 * Return the address of a given character within a null-terminated
 * string, or null if it is not found.
 */
-#include <asm/export.h>
+#include <linux/export.h>
 #include <asm/regdef.h>
 	.set noreorder

--- a/arch/alpha/lib/strcpy.S
+++ b/arch/alpha/lib/strcpy.S
@@ -6,7 +6,7 @@
 * Copy a null-terminated string from SRC to DST.  Return a pointer
 * to the null-terminator in the source.
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.text
 	.align 3

--- a/arch/alpha/lib/strlen.S
+++ b/arch/alpha/lib/strlen.S
@@ -12,7 +12,7 @@
 *	  do this instead of the 9 instructions that
 *	  binary search needs).
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.set noreorder
 	.set noat

--- a/arch/alpha/lib/strncat.S
+++ b/arch/alpha/lib/strncat.S
@@ -10,7 +10,7 @@
 * past count, whereas libc may write to count+1.  This follows the generic
 * implementation in lib/string.c and is, IMHO, more sensible.
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.text
 	.align 3

--- a/arch/alpha/lib/strncpy.S
+++ b/arch/alpha/lib/strncpy.S
@@ -11,7 +11,7 @@
 * version has cropped that bit o' nastiness as well as assuming that
 * __stxncpy is in range of a branch.
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.set noat
 	.set noreorder

--- a/arch/alpha/lib/strrchr.S
+++ b/arch/alpha/lib/strrchr.S
@@ -6,7 +6,7 @@
 * Return the address of the last occurrence of a given character
 * within a null-terminated string, or null if it is not found.
 */
-#include <asm/export.h>
+#include <linux/export.h>
 #include <asm/regdef.h>
 	.set noreorder

--- a/arch/alpha/lib/udiv-qrnnd.S
+++ b/arch/alpha/lib/udiv-qrnnd.S
@@ -25,7 +25,7 @@
 # along with GCC; see the file COPYING.  If not, write to the 
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
-#include <asm/export.h>
+#include <linux/export.h>
        .set noreorder
        .set noat

--- a/arch/arm/configs/dram_0x00000000.config
+++ b/arch/arm/configs/dram_0x00000000.config
+# Help: DRAM base at 0x00000000
 CONFIG_DRAM_BASE=0x00000000
--- a/arch/arm/configs/dram_0xc0000000.config
+++ b/arch/arm/configs/dram_0xc0000000.config
+# Help: DRAM base at 0xc0000000
 CONFIG_DRAM_BASE=0xc0000000
--- a/arch/arm/configs/dram_0xd0000000.config
+++ b/arch/arm/configs/dram_0xd0000000.config
+# Help: DRAM base at 0xd0000000
 CONFIG_DRAM_BASE=0xd0000000
--- a/arch/arm/configs/lpae.config
+++ b/arch/arm/configs/lpae.config
+# Help: Enable Large Physical Address Extension mode
 CONFIG_ARM_LPAE=y
 CONFIG_VMSPLIT_2G=y
--- a/arch/arm64/configs/virt.config
+++ b/arch/arm64/configs/virt.config
+# Help: Virtualization guest
 #
 # Base options for platforms
 #

--- a/arch/ia64/include/asm/Kbuild
+++ b/arch/ia64/include/asm/Kbuild
 # SPDX-License-Identifier: GPL-2.0
 generated-y += syscall_table.h
 generic-y += agp.h
-generic-y += export.h
 generic-y += kvm_para.h
 generic-y += mcs_spinlock.h
 generic-y += vtime.h
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -37,7 +37,7 @@
 *	pNonSys:	!pSys
 */
+#include <linux/export.h>
 #include <linux/pgtable.h>
 #include <asm/asmmacro.h>
 #include <asm/cache.h>
@@ -49,7 +49,6 @@
 #include <asm/thread_info.h>
 #include <asm/unistd.h>
 #include <asm/ftrace.h>
-#include <asm/export.h>
 #include "minstate.h"

--- a/arch/ia64/kernel/esi_stub.S
+++ b/arch/ia64/kernel/esi_stub.S
@@ -34,9 +34,9 @@
 #define PSR_BITS_TO_SET							\
 	(IA64_PSR_BN)
+#include <linux/export.h>
 #include <asm/processor.h>
 #include <asm/asmmacro.h>
-#include <asm/export.h>
 /*
 * Inputs:

--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
@@ -20,7 +20,7 @@
 *   Support for CPU Hotplug
 */
+#include <linux/export.h>
 #include <linux/pgtable.h>
 #include <asm/asmmacro.h>
 #include <asm/fpu.h>
@@ -33,7 +33,6 @@
 #include <asm/mca_asm.h>
 #include <linux/init.h>
 #include <linux/linkage.h>
-#include <asm/export.h>
 #ifdef CONFIG_HOTPLUG_CPU
 #define SAL_PSR_BITS_TO_SET				\

--- a/arch/ia64/kernel/ivt.S
+++ b/arch/ia64/kernel/ivt.S
@@ -47,7 +47,7 @@
 * Table is based upon EAS2.6 (Oct 1999)
 */
+#include <linux/export.h>
 #include <linux/pgtable.h>
 #include <asm/asmmacro.h>
 #include <asm/break.h>
@@ -58,7 +58,6 @@
 #include <asm/thread_info.h>
 #include <asm/unistd.h>
 #include <asm/errno.h>
-#include <asm/export.h>
 #if 0
 # define PSR_DEFAULT_BITS	psr.ac

--- a/arch/ia64/kernel/pal.S
+++ b/arch/ia64/kernel/pal.S
@@ -13,9 +13,9 @@
 * 05/24/2000 eranian Added support for physical mode static calls
 */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
 #include <asm/processor.h>
-#include <asm/export.h>
 	.data
 pal_entry_point:

--- a/arch/ia64/lib/clear_page.S
+++ b/arch/ia64/lib/clear_page.S
@@ -10,9 +10,9 @@
 * 3/08/02 davidm	Some more tweaking
 */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
 #include <asm/page.h>
-#include <asm/export.h>
 #ifdef CONFIG_ITANIUM
 # define L3_LINE_SIZE	64	// Itanium L3 line size

--- a/arch/ia64/lib/clear_user.S
+++ b/arch/ia64/lib/clear_user.S
@@ -12,8 +12,8 @@
 *	Stephane Eranian <eranian@hpl.hp.com>
 */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
-#include <asm/export.h>
 //
 // arguments

--- a/arch/ia64/lib/copy_page.S
+++ b/arch/ia64/lib/copy_page.S
@@ -15,9 +15,9 @@
 *
 * 4/06/01 davidm	Tuned to make it perform well both for cached and uncached copies.
 */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
 #include <asm/page.h>
-#include <asm/export.h>
 #define PIPE_DEPTH	3
 #define EPI		p[PIPE_DEPTH-1]

--- a/arch/ia64/lib/copy_page_mck.S
+++ b/arch/ia64/lib/copy_page_mck.S
@@ -60,9 +60,9 @@
 *	to fetch the second-half of the L2 cache line into L1, and the tX words are copied in
 *	an order that avoids bank conflicts.
 */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
 #include <asm/page.h>
-#include <asm/export.h>
 #define PREFETCH_DIST	8		// McKinley sustains 16 outstanding L2 misses (8 ld, 8 st)

--- a/arch/ia64/lib/copy_user.S
+++ b/arch/ia64/lib/copy_user.S
@@ -30,8 +30,8 @@
 *	- fix extraneous stop bit introduced by the EX() macro.
 */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
-#include <asm/export.h>
 //
 // Tuneable parameters

--- a/arch/ia64/lib/flush.S
+++ b/arch/ia64/lib/flush.S
@@ -8,9 +8,8 @@
 * 05/28/05 Zoltan Menyhart	Dynamic stride size
 */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
-#include <asm/export.h>
 	/*
 	 * flush_icache_range(start,end)

--- a/arch/ia64/lib/idiv32.S
+++ b/arch/ia64/lib/idiv32.S
@@ -15,8 +15,8 @@
 * (http://www.goodreads.com/book/show/2019887.Ia_64_and_Elementary_Functions)
 */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
-#include <asm/export.h>
 #ifdef MODULO
 # define OP	mod

--- a/arch/ia64/lib/idiv64.S
+++ b/arch/ia64/lib/idiv64.S
@@ -15,8 +15,8 @@
 * (http://www.goodreads.com/book/show/2019887.Ia_64_and_Elementary_Functions)
 */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
-#include <asm/export.h>
 #ifdef MODULO
 # define OP	mod

--- a/arch/ia64/lib/ip_fast_csum.S
+++ b/arch/ia64/lib/ip_fast_csum.S
@@ -13,8 +13,8 @@
 * Copyright (C) 2002, 2006 Ken Chen <kenneth.w.chen@intel.com>
 */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
-#include <asm/export.h>
 /*
 * Since we know that most likely this function is called with buf aligned

--- a/arch/ia64/lib/memcpy.S
+++ b/arch/ia64/lib/memcpy.S
@@ -14,8 +14,8 @@
 *	Stephane Eranian <eranian@hpl.hp.com>
 *	David Mosberger-Tang <davidm@hpl.hp.com>
 */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
-#include <asm/export.h>
 GLOBAL_ENTRY(memcpy)

--- a/arch/ia64/lib/memcpy_mck.S
+++ b/arch/ia64/lib/memcpy_mck.S
@@ -14,9 +14,9 @@
 * Copyright (C) 2002 Intel Corp.
 * Copyright (C) 2002 Ken Chen <kenneth.w.chen@intel.com>
 */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
 #include <asm/page.h>
-#include <asm/export.h>
 #define EK(y...) EX(y)

--- a/arch/ia64/lib/memset.S
+++ b/arch/ia64/lib/memset.S
@@ -18,8 +18,8 @@
   Since a stf.spill f0 can store 16B in one go, we use this instruction
   to get peak speed when value = 0.  */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
-#include <asm/export.h>
 #undef ret
 #define dest		in0

--- a/arch/ia64/lib/strlen.S
+++ b/arch/ia64/lib/strlen.S
@@ -17,8 +17,8 @@
 * 09/24/99 S.Eranian add speculation recovery code
 */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
-#include <asm/export.h>
 //
 //

--- a/arch/ia64/lib/strncpy_from_user.S
+++ b/arch/ia64/lib/strncpy_from_user.S
@@ -17,8 +17,8 @@
 *			 by Andreas Schwab <schwab@suse.de>).
 */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
-#include <asm/export.h>
 GLOBAL_ENTRY(__strncpy_from_user)
 	alloc r2=ar.pfs,3,0,0,0

--- a/arch/ia64/lib/strnlen_user.S
+++ b/arch/ia64/lib/strnlen_user.S
@@ -13,8 +13,8 @@
 * Copyright (C) 1999, 2001 David Mosberger-Tang <davidm@hpl.hp.com>
 */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
-#include <asm/export.h>
 GLOBAL_ENTRY(__strnlen_user)
 	.prologue

--- a/arch/ia64/lib/xor.S
+++ b/arch/ia64/lib/xor.S
@@ -5,8 +5,8 @@
 * Optimized RAID-5 checksumming functions for IA-64.
 */
+#include <linux/export.h>
 #include <asm/asmmacro.h>
-#include <asm/export.h>
 GLOBAL_ENTRY(xor_ia64_2)
 	.prologue

--- a/arch/powerpc/configs/disable-werror.config
+++ b/arch/powerpc/configs/disable-werror.config
+# Help: Disable -Werror
 CONFIG_PPC_DISABLE_WERROR=y
--- a/arch/powerpc/configs/security.config
+++ b/arch/powerpc/configs/security.config
+# Help: Common security options for PowerPC builds
 # This is the equivalent of booting with lockdown=integrity
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
@@ -12,4 +14,4 @@ CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # UBSAN bounds checking is very cheap and good for hardening
 CONFIG_UBSAN=y
 # CONFIG_UBSAN_MISC is not set
\ No newline at end of file
--- a/arch/riscv/configs/32-bit.config
+++ b/arch/riscv/configs/32-bit.config
+# Help: Build a 32-bit image
 CONFIG_ARCH_RV32I=y
 CONFIG_32BIT=y
 # CONFIG_PORTABLE is not set

--- a/arch/riscv/configs/64-bit.config
+++ b/arch/riscv/configs/64-bit.config
+# Help: Build a 64-bit image
 CONFIG_ARCH_RV64I=y
 CONFIG_64BIT=y
--- a/arch/s390/configs/btf.config
+++ b/arch/s390/configs/btf.config
+# Help: Enable BTF debug info
 CONFIG_DEBUG_INFO_BTF=y
--- a/arch/s390/configs/kasan.config
+++ b/arch/s390/configs/kasan.config
+# Help: Enable KASan for debugging
 CONFIG_KASAN=y
 CONFIG_KASAN_INLINE=y
 CONFIG_KASAN_VMALLOC=y
--- a/arch/sparc/include/asm/Kbuild
+++ b/arch/sparc/include/asm/Kbuild
@@ -2,6 +2,5 @@
 generated-y += syscall_table_32.h
 generated-y += syscall_table_64.h
 generic-y += agp.h
-generic-y += export.h
 generic-y += kvm_para.h
 generic-y += mcs_spinlock.h
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -8,6 +8,7 @@
 * Copyright (C) 1997 Anton Blanchard (anton@progsoc.uts.edu.au)
 */
+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <linux/errno.h>
 #include <linux/pgtable.h>
@@ -30,7 +31,6 @@
 #include <asm/unistd.h>
 #include <asm/asmmacro.h>
-#include <asm/export.h>
 #define curptr      g6

--- a/arch/sparc/kernel/head_32.S
+++ b/arch/sparc/kernel/head_32.S
@@ -11,6 +11,7 @@
 * CompactPCI platform by Eric Brower, 1999.
 */
+#include <linux/export.h>
 #include <linux/version.h>
 #include <linux/init.h>
@@ -25,7 +26,6 @@
 #include <asm/thread_info.h>	/* TI_UWINMASK */
 #include <asm/errno.h>
 #include <asm/pgtable.h>	/* PGDIR_SHIFT */
-#include <asm/export.h>
 	.data
 /* The following are used with the prom_vector node-ops to figure out

--- a/arch/sparc/kernel/head_64.S
+++ b/arch/sparc/kernel/head_64.S
@@ -9,6 +9,7 @@
 #include <linux/version.h>
 #include <linux/errno.h>
+#include <linux/export.h>
 #include <linux/threads.h>
 #include <linux/init.h>
 #include <linux/linkage.h>
@@ -33,7 +34,6 @@
 #include <asm/estate.h>
 #include <asm/sfafsr.h>
 #include <asm/unistd.h>
-#include <asm/export.h>
 /* This section from from _start to sparc64_boot_end should fit into
 * 0x0000000000404000 to 0x0000000000408000.

--- a/arch/sparc/lib/U1memcpy.S
+++ b/arch/sparc/lib/U1memcpy.S
@@ -6,10 +6,10 @@
 */
 #ifdef __KERNEL__
+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/visasm.h>
 #include <asm/asi.h>
-#include <asm/export.h>
 #define GLOBAL_SPARE	g7
 #else
 #define GLOBAL_SPARE	g5

--- a/arch/sparc/lib/VISsave.S
+++ b/arch/sparc/lib/VISsave.S
@@ -7,6 +7,7 @@
 * Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz)
 */
+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/asi.h>
@@ -14,7 +15,6 @@
 #include <asm/ptrace.h>
 #include <asm/visasm.h>
 #include <asm/thread_info.h>
-#include <asm/export.h>
 	/* On entry: %o5=current FPRS value, %g7 is callers address */
 	/* May clobber %o5, %g1, %g2, %g3, %g7, %icc, %xcc */

--- a/arch/sparc/lib/ashldi3.S
+++ b/arch/sparc/lib/ashldi3.S
@@ -6,8 +6,8 @@
 * Copyright (C) 1999 David S. Miller (davem@redhat.com)
 */
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>
 	.text
 ENTRY(__ashldi3)

--- a/arch/sparc/lib/ashrdi3.S
+++ b/arch/sparc/lib/ashrdi3.S
@@ -6,8 +6,8 @@
 * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
 */
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>
 	.text
 ENTRY(__ashrdi3)

--- a/arch/sparc/lib/atomic_64.S
+++ b/arch/sparc/lib/atomic_64.S
@@ -4,10 +4,10 @@
 * Copyright (C) 1999, 2007 2012 David S. Miller (davem@davemloft.net)
 */
+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/asi.h>
 #include <asm/backoff.h>
-#include <asm/export.h>
 	.text

--- a/arch/sparc/lib/bitops.S
+++ b/arch/sparc/lib/bitops.S
@@ -4,10 +4,10 @@
 * Copyright (C) 2000, 2007 David S. Miller (davem@davemloft.net)
 */
+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/asi.h>
 #include <asm/backoff.h>
-#include <asm/export.h>
 	.text

--- a/arch/sparc/lib/blockops.S
+++ b/arch/sparc/lib/blockops.S
@@ -5,9 +5,9 @@
 * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
 */
+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/page.h>
-#include <asm/export.h>
 	/* Zero out 64 bytes of memory at (buf + offset).
 	 * Assumes %g1 contains zero.

--- a/arch/sparc/lib/bzero.S
+++ b/arch/sparc/lib/bzero.S
@@ -5,8 +5,8 @@
 * Copyright (C) 2005 David S. Miller <davem@davemloft.net>
 */
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>
 	.text

--- a/arch/sparc/lib/checksum_32.S
+++ b/arch/sparc/lib/checksum_32.S
@@ -14,8 +14,8 @@
 *	BSD4.4 portable checksum routine
 */
+#include <linux/export.h>
 #include <asm/errno.h>
-#include <asm/export.h>
 #define CSUM_BIGCHUNK(buf, offset, sum, t0, t1, t2, t3, t4, t5)	\
 	ldd	[buf + offset + 0x00], t0;			\

--- a/arch/sparc/lib/checksum_64.S
+++ b/arch/sparc/lib/checksum_64.S
@@ -14,7 +14,7 @@
 *	BSD4.4 portable checksum routine
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.text
 csum_partial_fix_alignment:

--- a/arch/sparc/lib/clear_page.S
+++ b/arch/sparc/lib/clear_page.S
@@ -5,13 +5,13 @@
 * Copyright (C) 1997 Jakub Jelinek (jakub@redhat.com)
 */
+#include <linux/export.h>
 #include <linux/pgtable.h>
 #include <asm/visasm.h>
 #include <asm/thread_info.h>
 #include <asm/page.h>
 #include <asm/spitfire.h>
 #include <asm/head.h>
-#include <asm/export.h>
 	/* What we used to do was lock a TLB entry into a specific
 	 * TLB slot, clear the page with interrupts disabled, then

--- a/arch/sparc/lib/copy_in_user.S
+++ b/arch/sparc/lib/copy_in_user.S
@@ -4,9 +4,9 @@
 * Copyright (C) 1999, 2000, 2004 David S. Miller (davem@redhat.com)
 */
+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/asi.h>
-#include <asm/export.h>
 #define XCC xcc

--- a/arch/sparc/lib/copy_page.S
+++ b/arch/sparc/lib/copy_page.S
@@ -5,13 +5,13 @@
 * Copyright (C) 1997 Jakub Jelinek (jakub@redhat.com)
 */
+#include <linux/export.h>
 #include <asm/visasm.h>
 #include <asm/thread_info.h>
 #include <asm/page.h>
 #include <linux/pgtable.h>
 #include <asm/spitfire.h>
 #include <asm/head.h>
-#include <asm/export.h>
 	/* What we used to do was lock a TLB entry into a specific
 	 * TLB slot, clear the page with interrupts disabled, then

--- a/arch/sparc/lib/copy_user.S
+++ b/arch/sparc/lib/copy_user.S
@@ -12,11 +12,11 @@
 * Returns 0 if successful, otherwise count of bytes not copied yet
 */
+#include <linux/export.h>
 #include <asm/ptrace.h>
 #include <asm/asmmacro.h>
 #include <asm/page.h>
 #include <asm/thread_info.h>
-#include <asm/export.h>
 /* Work around cpp -rob */
 #define ALLOC #alloc

--- a/arch/sparc/lib/csum_copy.S
+++ b/arch/sparc/lib/csum_copy.S
@@ -4,7 +4,7 @@
 * Copyright (C) 2005 David S. Miller <davem@davemloft.net>
 */
-#include <asm/export.h>
+#include <linux/export.h>
 #ifdef __KERNEL__
 #define GLOBAL_SPARE	%g7

--- a/arch/sparc/lib/divdi3.S
+++ b/arch/sparc/lib/divdi3.S
@@ -5,7 +5,7 @@ This file is part of GNU CC.
 */
-#include <asm/export.h>
+#include <linux/export.h>
 	.text
 	.align 4
 	.globl __divdi3

--- a/arch/sparc/lib/ffs.S
+++ b/arch/sparc/lib/ffs.S
 /* SPDX-License-Identifier: GPL-2.0 */
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>
 	.register	%g2,#scratch

--- a/arch/sparc/lib/fls.S
+++ b/arch/sparc/lib/fls.S
@@ -5,8 +5,8 @@
 * and onward.
 */
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>
 	.text
 	.register	%g2, #scratch

--- a/arch/sparc/lib/fls64.S
+++ b/arch/sparc/lib/fls64.S
@@ -5,8 +5,8 @@
 * and onward.
 */
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>
 	.text
 	.register	%g2, #scratch

--- a/arch/sparc/lib/hweight.S
+++ b/arch/sparc/lib/hweight.S
 /* SPDX-License-Identifier: GPL-2.0 */
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>
 	.text
 	.align	32

--- a/arch/sparc/lib/ipcsum.S
+++ b/arch/sparc/lib/ipcsum.S
 /* SPDX-License-Identifier: GPL-2.0 */
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>
 	.text
 ENTRY(ip_fast_csum) /* %o0 = iph, %o1 = ihl */

--- a/arch/sparc/lib/locks.S
+++ b/arch/sparc/lib/locks.S
@@ -7,11 +7,11 @@
 * Copyright (C) 1998 Jakub Jelinek   (jj@ultra.linux.cz)
 */
+#include <linux/export.h>
 #include <asm/ptrace.h>
 #include <asm/psr.h>
 #include <asm/smp.h>
 #include <asm/spinlock.h>
-#include <asm/export.h>
 	.text
 	.align	4

--- a/arch/sparc/lib/lshrdi3.S
+++ b/arch/sparc/lib/lshrdi3.S
 /* SPDX-License-Identifier: GPL-2.0 */
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>
 ENTRY(__lshrdi3)
 	cmp	%o2, 0

--- a/arch/sparc/lib/mcount.S
+++ b/arch/sparc/lib/mcount.S
@@ -6,8 +6,8 @@
 * This can also be tweaked for kernel stack overflow detection.
 */
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>
 /*
 * This is the main variant and is called by C code.  GCC's -pg option

--- a/arch/sparc/lib/memcmp.S
+++ b/arch/sparc/lib/memcmp.S
@@ -5,9 +5,9 @@
 * Copyright (C) 2000, 2008 David S. Miller (davem@davemloft.net)
 */
+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/asm.h>
-#include <asm/export.h>
 	.text
 ENTRY(memcmp)

--- a/arch/sparc/lib/memcpy.S
+++ b/arch/sparc/lib/memcpy.S
--- a/arch/sparc/lib/memmove.S
+++ b/arch/sparc/lib/memmove.S
--- a/arch/sparc/lib/memscan_32.S
+++ b/arch/sparc/lib/memscan_32.S
--- a/arch/sparc/lib/memscan_64.S
+++ b/arch/sparc/lib/memscan_64.S
--- a/arch/sparc/lib/memset.S
+++ b/arch/sparc/lib/memset.S
--- a/arch/sparc/lib/muldi3.S
+++ b/arch/sparc/lib/muldi3.S
--- a/arch/sparc/lib/multi3.S
+++ b/arch/sparc/lib/multi3.S
--- a/arch/sparc/lib/strlen.S
+++ b/arch/sparc/lib/strlen.S
--- a/arch/sparc/lib/strncmp_32.S
+++ b/arch/sparc/lib/strncmp_32.S
--- a/arch/sparc/lib/strncmp_64.S
+++ b/arch/sparc/lib/strncmp_64.S
--- a/arch/sparc/lib/xor.S
+++ b/arch/sparc/lib/xor.S
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
--- a/include/linux/export.h
+++ b/include/linux/export.h
--- a/kernel/configs/debug.config
+++ b/kernel/configs/debug.config
--- a/kernel/configs/kvm_guest.config
+++ b/kernel/configs/kvm_guest.config
--- a/kernel/configs/nopm.config
+++ b/kernel/configs/nopm.config
--- a/kernel/configs/rust.config
+++ b/kernel/configs/rust.config
--- a/kernel/configs/x86_debug.config
+++ b/kernel/configs/x86_debug.config
--- a/kernel/configs/xen.config
+++ b/kernel/configs/xen.config
--- a/scripts/Makefile.extrawarn
+++ b/scripts/Makefile.extrawarn
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
--- a/scripts/Makefile.package
+++ b/scripts/Makefile.package
--- a/scripts/depmod.sh
+++ b/scripts/depmod.sh
--- a/scripts/dummy-tools/gcc
+++ b/scripts/dummy-tools/gcc
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
--- a/scripts/kconfig/lxdialog/dialog.h
+++ b/scripts/kconfig/lxdialog/dialog.h
--- a/scripts/kconfig/lxdialog/textbox.c
+++ b/scripts/kconfig/lxdialog/textbox.c
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
--- a/scripts/kconfig/nconf.gui.c
+++ b/scripts/kconfig/nconf.gui.c
--- a/scripts/kconfig/nconf.h
+++ b/scripts/kconfig/nconf.h
--- a/scripts/kconfig/preprocess.c
+++ b/scripts/kconfig/preprocess.c
--- a/scripts/kconfig/qconf-cfg.sh
+++ b/scripts/kconfig/qconf-cfg.sh
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
--- a/scripts/package/debian/rules
+++ b/scripts/package/debian/rules
--- a/scripts/package/install-extmod-build
+++ b/scripts/package/install-extmod-build
--- a/scripts/package/kernel.spec
+++ b/scripts/package/kernel.spec
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
--- a/scripts/remove-stale-files
+++ b/scripts/remove-stale-files
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion