Skip to content

Commit 0b6809a

Browse files
committed
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
2 parents eadaac4 + d8d326d commit 0b6809a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

scripts/mod/modpost.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ static void check_section(const char *modname, struct elf_info *elf,
772772
".ltext", ".ltext.*"
773773
#define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \
774774
".fixup", ".entry.text", ".exception.text", \
775-
".coldtext", ".softirqentry.text"
775+
".coldtext", ".softirqentry.text", ".irqentry.text"
776776

777777
#define ALL_TEXT_SECTIONS ".init.text", ".exit.text", \
778778
TEXT_SECTIONS, OTHER_TEXT_SECTIONS

scripts/package/install-extmod-build

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ if [ "${CC}" != "${HOSTCC}" ]; then
6969
#
7070
# Use the single-target build to avoid the modpost invocation, which
7171
# would overwrite Module.symvers.
72-
"${MAKE}" HOSTCC="${CC}" KBUILD_EXTMOD="${destdir}" scripts/
72+
"${MAKE}" HOSTCC="${CC}" KBUILD_OUTPUT=. KBUILD_EXTMOD="${destdir}" scripts/
7373

7474
cat <<-'EOF' > "${destdir}/scripts/Kbuild"
7575
subdir-y := basic
@@ -78,7 +78,7 @@ if [ "${CC}" != "${HOSTCC}" ]; then
7878
EOF
7979

8080
# Run once again to rebuild scripts/basic/ and scripts/mod/modpost.
81-
"${MAKE}" HOSTCC="${CC}" KBUILD_EXTMOD="${destdir}" scripts/
81+
"${MAKE}" HOSTCC="${CC}" KBUILD_OUTPUT=. KBUILD_EXTMOD="${destdir}" scripts/
8282

8383
rm -f "${destdir}/Kbuild" "${destdir}/scripts/Kbuild"
8484
fi

0 commit comments

Comments
 (0)