History

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

Linus Torvalds committed 1 year ago

Commit 0b6809a2 parents eadaac4 d8d326d2 files · +3 −3Browse files

Unified · Split

2 files
  1. scripts/mod/modpost.c +1 −1
  2. scripts/package/install-extmod-build +2 −2
scripts/mod/modpost.c+1−1
@@ -772,7 +772,7 @@ static void check_section(const char *modname, struct elf_info *elf, · 771 unmodified lines
772 ".ltext", ".ltext.*"772 ".ltext", ".ltext.*"
773#define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \773#define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \
774 ".fixup", ".entry.text", ".exception.text", \774 ".fixup", ".entry.text", ".exception.text", \
775 ".coldtext", ".softirqentry.text"775 ".coldtext", ".softirqentry.text", ".irqentry.text"
776 776
777#define ALL_TEXT_SECTIONS ".init.text", ".exit.text", \777#define ALL_TEXT_SECTIONS ".init.text", ".exit.text", \
778 TEXT_SECTIONS, OTHER_TEXT_SECTIONS778 TEXT_SECTIONS, OTHER_TEXT_SECTIONS
scripts/package/install-extmod-build+2−2
@@ -69,7 +69,7 @@ if [ "${CC}" != "${HOSTCC}" ]; then · 68 unmodified lines
69 #69 #
70 # Use the single-target build to avoid the modpost invocation, which70 # Use the single-target build to avoid the modpost invocation, which
71 # would overwrite Module.symvers.71 # would overwrite Module.symvers.
72 "${MAKE}" HOSTCC="${CC}" KBUILD_EXTMOD="${destdir}" scripts/72 "${MAKE}" HOSTCC="${CC}" KBUILD_OUTPUT=. KBUILD_EXTMOD="${destdir}" scripts/
73 73
74 cat <<-'EOF' > "${destdir}/scripts/Kbuild"74 cat <<-'EOF' > "${destdir}/scripts/Kbuild"
75 subdir-y := basic75 subdir-y := basic
@@ -78,7 +78,7 @@ if [ "${CC}" != "${HOSTCC}" ]; then · 2 unmodified lines
78 EOF78 EOF
79 79
80 # Run once again to rebuild scripts/basic/ and scripts/mod/modpost.80 # 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/
82 82
83 rm -f "${destdir}/Kbuild" "${destdir}/scripts/Kbuild"83 rm -f "${destdir}/Kbuild" "${destdir}/scripts/Kbuild"
84fi84fi

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t