summaryrefslogtreecommitdiffstats
path: root/0001-x86-Fix-compile-issues-with-rh_check_supported.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-06-02 13:57:57 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-06-02 13:57:57 -0500
commitfa1dee0747e32fcab94c1695e980d192cc8bac51 (patch)
treea3ad401737baf20be6c2b933bda8e5ce03364816 /0001-x86-Fix-compile-issues-with-rh_check_supported.patch
parentf0c9dd0c81745d7c1600ecc6ce3d20ba89c2f56e (diff)
downloadkernel-fa1dee0747e32fcab94c1695e980d192cc8bac51.tar.gz
kernel-fa1dee0747e32fcab94c1695e980d192cc8bac51.tar.xz
kernel-fa1dee0747e32fcab94c1695e980d192cc8bac51.zip
kernel-5.8.0-0.rc0.20200602gitf359287765c0.1
* Tue Jun 02 2020 CKI@GitLab <cki-project@redhat.com> [5.8.0-0.rc0.20200602gitf359287765c0.1] - f359287765c0 rebase - Fix update_scripts.sh unselective pattern sub (David Howells) - Updated changelog for the release based on b0c3ba31be3e ("CKI@GitLab") - Drop the static path configuration for the Sphinx docs (Jeremy Cline) - Sign off generated configuration patches (Jeremy Cline) - Use __make macro instead of make (Tom Stellard) - redhat/configs: Enable CONFIG_SMC91X and disable CONFIG_SMC911X (Prarit Bhargava) [http://bugzilla.redhat.com/1722136] Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-x86-Fix-compile-issues-with-rh_check_supported.patch')
-rw-r--r--0001-x86-Fix-compile-issues-with-rh_check_supported.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/0001-x86-Fix-compile-issues-with-rh_check_supported.patch b/0001-x86-Fix-compile-issues-with-rh_check_supported.patch
index bb0391bc0..057e95738 100644
--- a/0001-x86-Fix-compile-issues-with-rh_check_supported.patch
+++ b/0001-x86-Fix-compile-issues-with-rh_check_supported.patch
@@ -25,10 +25,10 @@ Signed-off-by: Don Zickus <dzickus@redhat.com>
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 0fd824c4162d..a7bf9730a2ca 100644
+index e677bb144835..6d31895c8e92 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
-@@ -750,6 +750,7 @@ static void __init trim_low_memory_range(void)
+@@ -756,6 +756,7 @@ static void __init trim_low_memory_range(void)
memblock_reserve(0, ALIGN(reserve_low, PAGE_SIZE));
}
@@ -36,7 +36,7 @@ index 0fd824c4162d..a7bf9730a2ca 100644
static bool valid_amd_processor(__u8 family, const char *model_id)
{
bool valid;
-@@ -874,6 +875,9 @@ static void rh_check_supported(void)
+@@ -880,6 +881,9 @@ static void rh_check_supported(void)
if (acpi_disabled && !guest)
pr_crit("ACPI has been disabled or is not available on this hardware. This may result in a single cpu boot, incorrect PCI IRQ routing, or boot failure.\n");
}
@@ -46,7 +46,7 @@ index 0fd824c4162d..a7bf9730a2ca 100644
/*
* Dump out kernel offset information on panic.
-@@ -1366,9 +1370,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1372,9 +1376,7 @@ void __init setup_arch(char **cmdline_p)
efi_apply_memmap_quirks();
#endif