diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
| commit | f05c02032c007399078784ea2ace322385f869b9 (patch) | |
| tree | 7c1bd28f37be1d28a3c8ace051c55472ba8bdd63 /0001-x86-Fix-compile-issues-with-rh_check_supported.patch | |
| parent | 55576abe986db86a9f4e2b105d2451800d652217 (diff) | |
| parent | f7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff) | |
| download | kernel-f05c02032c007399078784ea2ace322385f869b9.tar.gz kernel-f05c02032c007399078784ea2ace322385f869b9.tar.xz kernel-f05c02032c007399078784ea2ace322385f869b9.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
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 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 |