diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-07 18:05:58 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-07 18:05:58 +0200 |
commit | 9799143e8f057a9cf3406e611a8e53dca0aa703a (patch) | |
tree | ccf6ee2e5f76031a2e31a3b165de2e732e3efd1c /0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch | |
parent | def8cf129efcd41942f6684e26e737bbfca5d62e (diff) | |
parent | f7a55ba381de17d8e5511a97441944b797aa62a5 (diff) | |
download | kernel-9799143e8f057a9cf3406e611a8e53dca0aa703a.tar.gz kernel-9799143e8f057a9cf3406e611a8e53dca0aa703a.tar.xz kernel-9799143e8f057a9cf3406e611a8e53dca0aa703a.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc8.20201007git7575fdda569b.30.vanilla.1.fc32
Diffstat (limited to '0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch')
-rw-r--r-- | 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch b/0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch deleted file mode 100644 index 2c767b464..000000000 --- a/0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Peter Robinson <pbrobinson@gmail.com> -Date: Fri, 10 Jul 2020 16:18:59 +0100 -Subject: [PATCH] Fixes "acpi: prefer booting with ACPI over DTS" to be RHEL - only - -The ACPI prefernce is RHEL specific, in Fedora we use upstream defaults so -it doesn't randomly change the expectations as to how certain hardware works -that generally isn't classed as "enterprise". So wrap it in the special RHEL -check as it should be for the ARK kernels. - -Signed-off-by: Peter Robinson <pbrobinson@gmail.com> -CC: Mark Salter <msalter@redhat.com> ---- - arch/arm64/kernel/acpi.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c -index 5cb0d548ec25..999f0a232e57 100644 ---- a/arch/arm64/kernel/acpi.c -+++ b/arch/arm64/kernel/acpi.c -@@ -40,7 +40,11 @@ int acpi_pci_disabled = 1; /* skip ACPI PCI scan and IRQ initialization */ - EXPORT_SYMBOL(acpi_pci_disabled); - - static bool param_acpi_off __initdata; -+#ifdef CONFIG_RHEL_DIFFERENCES - static bool param_acpi_on __initdata = true; -+#else -+static bool param_acpi_on __initdata; -+#endif - static bool param_acpi_force __initdata; - - static int __init parse_acpi(char *arg) --- -2.28.0 - |