1
0
forked from rpms/kernel

Fix builds in armhfp, i686 and ppc64le

This commit is contained in:
Pablo Greco 2022-02-23 18:36:36 +00:00
parent eb952b2f3c
commit 47c085aad0
3 changed files with 50 additions and 2 deletions

View File

@ -0,0 +1,37 @@
From 48068b4e3675eac937d64530e26a1c4a6b344523 Mon Sep 17 00:00:00 2001
From: Pablo Greco <pgreco@centosproject.org>
Date: Tue, 22 Feb 2022 23:12:06 +0000
Subject: [PATCH] Fix build on i686
---
arch/x86/kernel/resource.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/x86/kernel/resource.c b/arch/x86/kernel/resource.c
index e8dc9bc..5038c99 100644
--- a/arch/x86/kernel/resource.c
+++ b/arch/x86/kernel/resource.c
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
#include <linux/ioport.h>
#include <asm/e820/api.h>
+#ifdef CONFIG_X86_64
#include <asm/pci_x86.h>
+#endif
static void resource_clip(struct resource *res, resource_size_t start,
resource_size_t end)
@@ -29,8 +31,10 @@ static void remove_e820_regions(struct resource *avail)
int i;
struct e820_entry *entry;
+#ifdef CONFIG_X86_64
if (!pci_use_e820)
return;
+#endif
for (i = 0; i < e820_table->nr_entries; i++) {
entry = &e820_table->entries[i];
--
2.18.4

View File

@ -11,4 +11,4 @@
driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb soundwire staging tty uio w1"
singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject hid-sensor-hub hid-sensor-magn-3d hid-sensor-incl-3d hid-sensor-gyro-3d hid-sensor-iio-common hid-sensor-accel-3d hid-sensor-trigger hid-sensor-als hid-sensor-rotation hid-sensor-temperature hid-sensor-humidity target_core_user sbp_target cxgbit chcr parport_serial regmap-sdw hid-asus"
singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject hid-sensor-hub hid-sensor-magn-3d hid-sensor-incl-3d hid-sensor-gyro-3d hid-sensor-iio-common hid-sensor-accel-3d hid-sensor-trigger hid-sensor-als hid-sensor-rotation hid-sensor-temperature hid-sensor-humidity hid-sensor-custom-intel-hinge target_core_user sbp_target cxgbit chcr parport_serial regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus iTCO_wdt rnbd-client rnbd-server mlx5_vdpa spi-altera-dfl"

View File

@ -331,12 +331,14 @@ Summary: The Linux kernel
%if %{with_baseonly}
%define with_pae 0
%define with_debug 0
%define with_vdso_install 0
%endif
# if requested, only build pae kernel
%if %{with_paeonly}
%define with_up 0
%define with_debug 0
%define with_vdso_install 0
%endif
# if requested, only build debug kernel
@ -344,6 +346,7 @@ Summary: The Linux kernel
%if %{debugbuildsenabled}
%define with_up 0
%endif
%define with_vdso_install 0
%define with_pae 0
%define with_tools 0
%define with_perf 0
@ -429,6 +432,7 @@ Summary: The Linux kernel
%define make_target vmlinux
%define kernel_image vmlinux
%define kernel_image_elf 1
%define use_vdso 0
%define all_arch_configs kernel-%{version}-ppc64le*.config
%define kcflags -O3
%endif
@ -832,6 +836,7 @@ Source5000: patch-5.%{base_sublevel}-git%{gitrev}.xz
%if !%{nopatches}
Patch6: fedora-v5.15.patch
Patch7: 0001-Fix-build-on-i686.patch
Patch11: 0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch
#Patch12: 0001-kdump-add-support-for-crashkernel-auto.patch
#Patch15: 0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch
@ -854,7 +859,11 @@ Patch104: 0001-brcm-rpi4-fix-usb-numeration.patch
# RPi-4 and wifi issues
#Patch105: arm-dts-rpi-4-disable-wifi-frequencies.patch
%ifarch aarch64
Patch10000: linux-honeycomb-5.15.y.patch
%else
Source10000: linux-honeycomb-5.15.y.patch
%endif
# END OF PATCH DEFINITIONS
@ -2031,7 +2040,9 @@ BuildKernel() {
cp -a --parents tools/arch/x86/include/asm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
cp -a --parents tools/arch/x86/include/uapi/asm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
cp -a --parents tools/objtool/arch/x86/lib $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
if [ -d tools/objtool/arch/x86/lib ];then
cp -a --parents tools/objtool/arch/x86/lib $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
fi
cp -a --parents tools/arch/x86/lib/ $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
cp -a --parents tools/arch/x86/tools/gen-insn-attr-x86.awk $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
cp -a --parents tools/objtool/arch/x86/ $RPM_BUILD_ROOT/lib/modules/$KernelVer/build