diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-26 16:25:37 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-26 16:25:37 +0200 |
| commit | 8646321dee2344a7d6b8c53bc1694c23d6992fe8 (patch) | |
| tree | 46bb44a5c3e9ce1f628d79d9ec94fdb359d1e46b | |
| parent | 3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e (diff) | |
| parent | b8e77e8fe22d8bc41c1abac6d8a69353c99c2d6e (diff) | |
| download | kernel-8646321dee2344a7d6b8c53bc1694c23d6992fe8.tar.gz kernel-8646321dee2344a7d6b8c53bc1694c23d6992fe8.tar.xz kernel-8646321dee2344a7d6b8c53bc1694c23d6992fe8.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
| -rw-r--r-- | 0001-ARM64-vdso32-Install-vdso32-from-vdso_install.patch | 48 | ||||
| -rw-r--r-- | filter-ppc64le.sh.fedora | 2 | ||||
| -rw-r--r-- | kernel.spec | 4 |
3 files changed, 53 insertions, 1 deletions
diff --git a/0001-ARM64-vdso32-Install-vdso32-from-vdso_install.patch b/0001-ARM64-vdso32-Install-vdso32-from-vdso_install.patch new file mode 100644 index 000000000..b399551a6 --- /dev/null +++ b/0001-ARM64-vdso32-Install-vdso32-from-vdso_install.patch @@ -0,0 +1,48 @@ +From 8d75785a814241587802655cc33e384230744f0c Mon Sep 17 00:00:00 2001 +From: Stephen Boyd <swboyd@chromium.org> +Date: Mon, 17 Aug 2020 18:49:50 -0700 +Subject: Revert [PATCH] ARM64: vdso32: Install vdso32 from vdso_install + +Add the 32-bit vdso Makefile to the vdso_install rule so that 'make +vdso_install' installs the 32-bit compat vdso when it is compiled. + +Fixes: a7f71a2c8903 ("arm64: compat: Add vDSO") +Signed-off-by: Stephen Boyd <swboyd@chromium.org> +Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com> +Acked-by: Will Deacon <will@kernel.org> +Cc: Vincenzo Frascino <vincenzo.frascino@arm.com> +Link: https://lore.kernel.org/r/20200818014950.42492-1-swboyd@chromium.org +Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> +--- + arch/arm64/Makefile | 1 - + arch/arm64/kernel/vdso32/Makefile | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile +index 55bc8546d9c7..b45f0124cc16 100644 +--- a/arch/arm64/Makefile ++++ b/arch/arm64/Makefile +@@ -165,7 +165,6 @@ zinstall install: + PHONY += vdso_install + vdso_install: + $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@ +- $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 $@ + + # We use MRPROPER_FILES and CLEAN_FILES now + archclean: +diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile +index 5139a5f19256..d6adb4677c25 100644 +--- a/arch/arm64/kernel/vdso32/Makefile ++++ b/arch/arm64/kernel/vdso32/Makefile +@@ -208,7 +208,7 @@ quiet_cmd_vdsosym = VDSOSYM $@ + cmd_vdsosym = $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@ + + # Install commands for the unstripped file +-quiet_cmd_vdso_install = INSTALL32 $@ ++quiet_cmd_vdso_install = INSTALL $@ + cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/vdso32.so + + vdso.so: $(obj)/vdso.so.dbg +-- +2.26.2 + diff --git a/filter-ppc64le.sh.fedora b/filter-ppc64le.sh.fedora index 2c3444bca..070149115 100644 --- a/filter-ppc64le.sh.fedora +++ b/filter-ppc64le.sh.fedora @@ -11,4 +11,4 @@ driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia platform power ssb staging tty uio uwb w1" -singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls rnbd-client rnbd-server" +singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls rnbd-client rnbd-server mlx5_vdpa" diff --git a/kernel.spec b/kernel.spec index 1495a47d7..6ed2c0e8d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -792,6 +792,9 @@ Patch72: 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch Patch73: 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch Patch74: 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch +#Temporary build fix +Patch75: 0001-ARM64-vdso32-Install-vdso32-from-vdso_install.patch + %endif # empty final patch to facilitate testing of kernel patches @@ -1367,6 +1370,7 @@ ApplyOptionalPatch 0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch ApplyOptionalPatch 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch ApplyOptionalPatch 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch ApplyOptionalPatch 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch +ApplyOptionalPatch 0001-ARM64-vdso32-Install-vdso32-from-vdso_install.patch %endif |