diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 20:59:56 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 20:59:56 +0200 |
commit | 7b32641801900ee7e32065b436d7318c5d7a972e (patch) | |
tree | 7e1f1ffca46787c5ba55af0a2fc9767f9c6e5594 /0001-x86-Fix-compile-issues-with-rh_check_supported.patch | |
parent | 506260a3258dfcbd81c9c8b2f051b9c515ad6071 (diff) | |
parent | 61b5e2fd06a4be7134afb1cd363002e015123f7f (diff) | |
download | kernel-7b32641801900ee7e32065b436d7318c5d7a972e.tar.gz kernel-7b32641801900ee7e32065b436d7318c5d7a972e.tar.xz kernel-7b32641801900ee7e32065b436d7318c5d7a972e.zip |
merge originkernel-5.8.0-0.rc3.1.vanilla.1.fc33kernel-5.8.0-0.rc3.1.vanilla.1.fc32kernel-5.8.0-0.rc3.1.vanilla.1.fc31
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 | 10 |
1 files changed, 5 insertions, 5 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..f3d7a3c8e 100644 --- a/0001-x86-Fix-compile-issues-with-rh_check_supported.patch +++ b/0001-x86-Fix-compile-issues-with-rh_check_supported.patch @@ -31,7 +31,7 @@ index e677bb144835..6d31895c8e92 100644 @@ -756,6 +756,7 @@ static void __init trim_low_memory_range(void) memblock_reserve(0, ALIGN(reserve_low, PAGE_SIZE)); } - + +#ifdef CONFIG_RHEL_DIFFERENCES static bool valid_amd_processor(__u8 family, const char *model_id) { @@ -43,19 +43,19 @@ index e677bb144835..6d31895c8e92 100644 +#else +#define rh_check_supported() +#endif - + /* * Dump out kernel offset information on panic. @@ -1372,9 +1376,7 @@ void __init setup_arch(char **cmdline_p) efi_apply_memmap_quirks(); #endif - + -#ifdef CONFIG_RHEL_DIFFERENCES rh_check_supported(); -#endif - + unwind_init(); } -- -2.26.2 +2.25.4 |