diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-12-10 21:32:36 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-12-10 21:33:03 +0300 |
| commit | 05453d36a2fcaf1ea49939f8f9a8cd9dcd516159 (patch) | |
| tree | cb43431bb6d4dbd428e43680cc070935a2bf6268 /scripts/package | |
| parent | 13148e22c151e871c1c00bab519f39cc6f6ea37a (diff) | |
| parent | 7cb1b466315004af98f6ba6c2546bb713ca3c237 (diff) | |
| download | linux-05453d36a2fcaf1ea49939f8f9a8cd9dcd516159.tar.xz | |
Merge branch 'linus' into x86/cleanups, to resolve conflict
These two commits interact:
upstream: 73da582a476e ("x86/cpu/topology: Remove limit of CPUs due to disabled IO/APIC")
x86/cleanups: 13148e22c151 ("x86/apic: Remove "disablelapic" cmdline option")
Resolve it.
Conflicts:
arch/x86/kernel/cpu/topology.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/package')
| -rwxr-xr-x | scripts/package/install-extmod-build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/package/install-extmod-build b/scripts/package/install-extmod-build index 64d958ee45f3..d3c5b104c063 100755 --- a/scripts/package/install-extmod-build +++ b/scripts/package/install-extmod-build @@ -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 |