diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-02 21:01:33 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-02 21:01:33 +0200 |
commit | 02ba673575de31650bcb39d7cfe0224bf1b7b449 (patch) | |
tree | 77ab559fd57445dc54d568b361dc54ef7b6ee3a8 /0001-x86-Fix-compile-issues-with-rh_check_supported.patch | |
parent | 74ab72ba21a4bb026b91637fd91ef20edef750a0 (diff) | |
parent | fa1dee0747e32fcab94c1695e980d192cc8bac51 (diff) | |
download | kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.tar.gz kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.tar.xz kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200602gitf359287765c0.1.vanilla.1.fc33
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.patch | 8 |
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 |