diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-11 05:54:53 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-11 05:54:53 +0200 |
commit | 168917328214e94a54dbd4ef227dab46029b8134 (patch) | |
tree | 9f5fbf0580f00cf39b1b0cfe1dacc387499e999f /0001-Add-support-for-deprecating-processors.patch | |
parent | 38d5c149cae32d286308f7962e1d561e7939072f (diff) | |
parent | 8ae1eddbf56e902877016abbadb2150afe87711c (diff) | |
download | kernel-168917328214e94a54dbd4ef227dab46029b8134.tar.gz kernel-168917328214e94a54dbd4ef227dab46029b8134.tar.xz kernel-168917328214e94a54dbd4ef227dab46029b8134.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc31
Diffstat (limited to '0001-Add-support-for-deprecating-processors.patch')
-rw-r--r-- | 0001-Add-support-for-deprecating-processors.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-Add-support-for-deprecating-processors.patch b/0001-Add-support-for-deprecating-processors.patch index fb562e37c..60fb39191 100644 --- a/0001-Add-support-for-deprecating-processors.patch +++ b/0001-Add-support-for-deprecating-processors.patch @@ -130,10 +130,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com> 2 files changed, 132 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index 74682b8d09b0..5b25b8fef254 100644 +index 8be042df12c3..a723808f4244 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c -@@ -1203,6 +1203,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) +@@ -1236,6 +1236,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) cpu_detect(c); get_cpu_vendor(c); get_cpu_cap(c); |