Commit 0b6809a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v6.13' of... 

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

Pull Kbuild fixes from Masahiro Yamada:

 - Fix a section mismatch warning in modpost

 - Fix Debian package build error with the O= option

* tag 'kbuild-fixes-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: deb-pkg: fix build error with O=
  modpost: Add .irqentry.text to OTHER_SECTIONS
parents eadaac4d d8d326d6

scripts/mod/modpost.c

+1 −1
Original line number Diff line number Diff line
@@ -772,7 +772,7 @@ static void check_section(const char *modname, struct elf_info *elf, 
		".ltext", ".ltext.*"

#define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \

		".fixup", ".entry.text", ".exception.text", \

		".coldtext", ".softirqentry.text"

		".coldtext", ".softirqentry.text", ".irqentry.text"



#define ALL_TEXT_SECTIONS  ".init.text", ".exit.text", \

		TEXT_SECTIONS, OTHER_TEXT_SECTIONS

scripts/package/install-extmod-build

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ if [ "${CC}" != "${HOSTCC}" ]; then 
	#

	# Use the single-target build to avoid the modpost invocation, which

	# would overwrite Module.symvers.

	"${MAKE}" HOSTCC="${CC}" KBUILD_EXTMOD="${destdir}" scripts/

	"${MAKE}" HOSTCC="${CC}" KBUILD_OUTPUT=. KBUILD_EXTMOD="${destdir}" scripts/



	cat <<-'EOF' >  "${destdir}/scripts/Kbuild"

	subdir-y := basic
@@ -78,7 +78,7 @@ if [ "${CC}" != "${HOSTCC}" ]; then 
	EOF



	# Run once again to rebuild scripts/basic/ and scripts/mod/modpost.

	"${MAKE}" HOSTCC="${CC}" KBUILD_EXTMOD="${destdir}" scripts/

	"${MAKE}" HOSTCC="${CC}" KBUILD_OUTPUT=. KBUILD_EXTMOD="${destdir}" scripts/



	rm -f "${destdir}/Kbuild" "${destdir}/scripts/Kbuild"

fi