diff options
Diffstat (limited to 'patch-5.12.0-redhat.patch')
| -rw-r--r-- | patch-5.12.0-redhat.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch index 7df19e84b..020348cfc 100644 --- a/patch-5.12.0-redhat.patch +++ b/patch-5.12.0-redhat.patch @@ -138,7 +138,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 73add16f9898..892e60ae6d18 100644 +index cc77fd45ca64..c60efba564da 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -288,7 +288,7 @@ index ab640abe26b6..dad705387133 100644 setup_force_cpu_cap(X86_FEATURE_CPUID); cpu_parse_early_param(); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index d883176ef2ce..5abf76890d93 100644 +index 5ecd69a48393..36549c6170bf 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -18,6 +18,7 @@ @@ -374,7 +374,7 @@ index d883176ef2ce..5abf76890d93 100644 dmi_setup(); /* -@@ -1112,19 +1165,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1115,19 +1168,7 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); @@ -395,7 +395,7 @@ index d883176ef2ce..5abf76890d93 100644 reserve_initrd(); -@@ -1232,6 +1273,8 @@ void __init setup_arch(char **cmdline_p) +@@ -1230,6 +1271,8 @@ void __init setup_arch(char **cmdline_p) efi_apply_memmap_quirks(); #endif @@ -467,7 +467,7 @@ index e209081d644b..7484bcf59a1b 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 84bb7c1929f1..2e588a4178ef 100644 +index 6efe7edd7b1e..603f912b7743 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1639,6 +1639,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) |