summaryrefslogtreecommitdiffstats
path: root/0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-08-13 20:17:57 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-08-13 20:17:57 +0200
commitf05c02032c007399078784ea2ace322385f869b9 (patch)
tree7c1bd28f37be1d28a3c8ace051c55472ba8bdd63 /0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch
parent55576abe986db86a9f4e2b105d2451800d652217 (diff)
parentf7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff)
downloadkernel-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-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch')
-rw-r--r--0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch b/0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch
index 924c4393d..183f1e10d 100644
--- a/0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch
+++ b/0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch
@@ -19,10 +19,10 @@ Cc: David Arcari <darcari@redhat.com>
1 file changed, 85 deletions(-)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 6d31895c8e92..4e43f6957621 100644
+index 66441cb9c1af..6100995124f9 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
-@@ -757,72 +757,6 @@ static void __init trim_low_memory_range(void)
+@@ -758,72 +758,6 @@ static void __init trim_low_memory_range(void)
}
#ifdef CONFIG_RHEL_DIFFERENCES
@@ -95,7 +95,7 @@ index 6d31895c8e92..4e43f6957621 100644
static void rh_check_supported(void)
{
-@@ -843,27 +777,8 @@ static void rh_check_supported(void)
+@@ -844,27 +778,8 @@ static void rh_check_supported(void)
*/
switch (boot_cpu_data.x86_vendor) {
case X86_VENDOR_AMD: