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-08-13 12:44:32 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-08-13 12:44:32 -0500
commitf7a3bf654752fa0e92c7ab3e57e48d3415632852 (patch)
tree499e2cc107f4bff8b98bd676b494d51ae89dcb4a /0001-x86-Fix-compile-issues-with-rh_check_supported.patch
parent142d1dbc8748e066ce794a391416b045d570be71 (diff)
downloadkernel-f7a3bf654752fa0e92c7ab3e57e48d3415632852.tar.gz
kernel-f7a3bf654752fa0e92c7ab3e57e48d3415632852.tar.xz
kernel-f7a3bf654752fa0e92c7ab3e57e48d3415632852.zip
kernel-5.9.0-0.rc0.20200813gitdc06fe51d26e.1
* Thu Aug 13 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc0.20200813gitdc06fe51d26e.1] - dc06fe51d26e rebase - More mismatches ("Justin M. Forbes") - Fedora config change due to deps ("Justin M. Forbes") - CONFIG_SND_SOC_MAX98390 is now selected by SND_SOC_INTEL_DA7219_MAX98357A_GENERIC ("Justin M. Forbes") - Config change required for build part 2 ("Justin M. Forbes") - Config change required for build ("Justin M. Forbes") - Fedora config update ("Justin M. Forbes") - Revert "Merge branch 'make_configs_fix' into 'os-build'" (Justin Forbes) - redhat/configs/process_configs.sh: Remove *.config.orig files (Prarit Bhargava) - redhat/configs/process_configs.sh: Add process_configs_known_broken flag (Prarit Bhargava) - redhat/Makefile: Fix '*-configs' targets (Prarit Bhargava) - Updated changelog for the release based on v5.8 (Fedora Kernel Team) - Add ability to sync upstream through Makefile (Don Zickus) - Add master merge check (Don Zickus) - Replace hardcoded values 'os-build' and project id with variables (Don Zickus) - gitattributes: Remove unnecesary export restrictions (Prarit Bhargava) - redhat/Makefile.common: Fix MARKER (Prarit Bhargava) 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 057e95738..adf7fad47 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 e677bb144835..6d31895c8e92 100644
+index b57e6dd6d7ef..66441cb9c1af 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
-@@ -756,6 +756,7 @@ static void __init trim_low_memory_range(void)
+@@ -757,6 +757,7 @@ static void __init trim_low_memory_range(void)
memblock_reserve(0, ALIGN(reserve_low, PAGE_SIZE));
}
@@ -36,7 +36,7 @@ index e677bb144835..6d31895c8e92 100644
static bool valid_amd_processor(__u8 family, const char *model_id)
{
bool valid;
-@@ -880,6 +881,9 @@ static void rh_check_supported(void)
+@@ -881,6 +882,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 e677bb144835..6d31895c8e92 100644
/*
* Dump out kernel offset information on panic.
-@@ -1372,9 +1376,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1371,9 +1375,7 @@ void __init setup_arch(char **cmdline_p)
efi_apply_memmap_quirks();
#endif