diff options
author | Peter Robinson <pbrobinson@gmail.com> | 2020-07-06 16:00:08 +0100 |
---|---|---|
committer | Peter Robinson <pbrobinson@gmail.com> | 2020-07-06 16:00:08 +0100 |
commit | 38a4514f2099ff327dd73df249e43e5f9358796b (patch) | |
tree | 3738892f45275205404f387aaf47f4c23259bdc9 | |
parent | 59aac79c260b00b5caad750024ad7421fa658702 (diff) | |
download | kernel-38a4514f2099ff327dd73df249e43e5f9358796b.tar.gz kernel-38a4514f2099ff327dd73df249e43e5f9358796b.tar.xz kernel-38a4514f2099ff327dd73df249e43e5f9358796b.zip |
drop RH only patch, Fedora follows upstream
-rw-r--r-- | 0001-acpi-prefer-booting-with-ACPI-over-DTS.patch | 56 | ||||
-rw-r--r-- | kernel.spec | 1 |
2 files changed, 0 insertions, 57 deletions
diff --git a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch deleted file mode 100644 index e188b5a2d..000000000 --- a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Mark Salter <msalter@redhat.com> -Date: Fri, 11 May 2018 21:01:17 -0400 -Subject: [PATCH] acpi: prefer booting with ACPI over DTS - -Message-id: <20180511210117.10457-1-msalter@redhat.com> -Patchwork-id: 214708 -O-Subject: [RHEL-8 BZ1576869] [RHEL only] acpi: prefer booting with ACPI over DTS -Bugzilla: 1576869 -RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com> -RH-Acked-by: Tony Camuso <tcamuso@redhat.com> -RH-Acked-by: Bhupesh Sharma <bhsharma@redhat.com> -RH-Acked-by: Dean Nelson <dnelson@redhat.com> - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1576869 -Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=16208479 -Testing: Verified kernel defaults to ACPI on Mustang - -From: Jonathan Toppins <jtoppins@redhat.com> - - This patch forces ACPI boot tables to be preferred over DTS. - - Currently for ACPI to be used a user either has to set acpi=on on the - kernel command line or make sure any device tree passed to the kernel - is empty. If the dtb passed to the kernel is non-empty then device-tree - will be chosen as the boot method of choice. - - RHEL does not wish to support this boot method so change table boot - preferences to use ACPI. In the event ACPI table checks fail the kernel - will fallback to using DTS to boot. - - Signed-off-by: Jonathan Toppins <jtoppins@redhat.com> - -Upstream Status: RHEL only -Signed-off-by: Mark Salter <msalter@redhat.com> -Signed-off-by: Herton R. Krzesinski <herton@redhat.com> ---- - arch/arm64/kernel/acpi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c -index a100483b47c4..29f693734edb 100644 ---- a/arch/arm64/kernel/acpi.c -+++ b/arch/arm64/kernel/acpi.c -@@ -39,7 +39,7 @@ int acpi_pci_disabled = 1; /* skip ACPI PCI scan and IRQ initialization */ - EXPORT_SYMBOL(acpi_pci_disabled); - - static bool param_acpi_off __initdata; --static bool param_acpi_on __initdata; -+static bool param_acpi_on __initdata = true; - static bool param_acpi_force __initdata; - - static int __init parse_acpi(char *arg) --- -2.26.2 - diff --git a/kernel.spec b/kernel.spec index 33c149dbd..8378f3494 100644 --- a/kernel.spec +++ b/kernel.spec @@ -789,7 +789,6 @@ Source5000: patch-5.%{base_sublevel}-git%{gitrev}.xz Patch6: 0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch Patch8: 0001-ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m.patch Patch9: 0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch -Patch10: 0001-acpi-prefer-booting-with-ACPI-over-DTS.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 |