diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-16 12:13:52 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-16 12:13:52 +0200 |
| commit | 8e272e331ad893d7f32036099bccfcfaf5bee3ff (patch) | |
| tree | 3992c9caa27e57a0466c4fd8a83ec921a05bf56e /patch-5.12-redhat.patch | |
| parent | 9eb99e30655566f65c318742eb0af2ae3251bb42 (diff) | |
| parent | eb00041066fd09a074a686b6983f4f6729f3c285 (diff) | |
| download | kernel-8e272e331ad893d7f32036099bccfcfaf5bee3ff.tar.gz kernel-8e272e331ad893d7f32036099bccfcfaf5bee3ff.tar.xz kernel-8e272e331ad893d7f32036099bccfcfaf5bee3ff.zip | |
Merge remote-tracking branch 'origin/f33' into f33-user-thl-vanilla-fedora
Diffstat (limited to 'patch-5.12-redhat.patch')
| -rw-r--r-- | patch-5.12-redhat.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patch-5.12-redhat.patch b/patch-5.12-redhat.patch index a082bca72..af5ab8ea3 100644 --- a/patch-5.12-redhat.patch +++ b/patch-5.12-redhat.patch @@ -65,7 +65,7 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Makefile b/Makefile -index d53577db1085..a34665269a9a 100644 +index ebc02c56db03..13bbf56b1bd3 100644 --- a/Makefile +++ b/Makefile @@ -495,6 +495,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE @@ -165,7 +165,7 @@ index 5aab59ad5688..c53572b81c37 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index ccab6cf91283..dafae5a186d3 100644 +index e79f21d13a0d..7f0b86161e13 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -18,6 +18,7 @@ @@ -176,7 +176,7 @@ index ccab6cf91283..dafae5a186d3 100644 #include <linux/usb/xhci-dbgp.h> #include <linux/static_call.h> #include <linux/swiotlb.h> -@@ -954,6 +955,13 @@ void __init setup_arch(char **cmdline_p) +@@ -955,6 +956,13 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); @@ -190,7 +190,7 @@ index ccab6cf91283..dafae5a186d3 100644 dmi_setup(); /* -@@ -1112,19 +1120,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1113,19 +1121,7 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); |