diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-15 19:10:41 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-15 19:10:41 +0100 |
| commit | 6c602f33aeb6c613777ccd4f62e1e2ebf2f91e33 (patch) | |
| tree | f7a5d3678d703c5dac07676181c7445a9f625728 /patch-5.12.0-redhat.patch | |
| parent | f033ffda6f7a7b7019622f45dd3473684259d3c1 (diff) | |
| parent | 613e26bbec9f6f62fe7f9989c39370c1273d545a (diff) | |
| download | kernel-6c602f33aeb6c613777ccd4f62e1e2ebf2f91e33.tar.gz kernel-6c602f33aeb6c613777ccd4f62e1e2ebf2f91e33.tar.xz kernel-6c602f33aeb6c613777ccd4f62e1e2ebf2f91e33.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc3.170.vanilla.1.fc35kernel-5.12.0-0.rc3.170.vanilla.1.fc34kernel-5.12.0-0.rc3.170.vanilla.1.fc33kernel-5.12.0-0.rc3.170.vanilla.1.fc32
Diffstat (limited to 'patch-5.12.0-redhat.patch')
| -rw-r--r-- | patch-5.12.0-redhat.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch index ee803bc2d..e4f89e857 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 31dcdb3d61fa..222043217b7e 100644 +index a28bb374663d..02c6a9b5180f 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -152,7 +152,7 @@ index 31dcdb3d61fa..222043217b7e 100644 # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # -@@ -493,6 +497,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE +@@ -495,6 +499,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE KBUILD_CFLAGS := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \ -Werror=implicit-function-declaration -Werror=implicit-int \ @@ -160,7 +160,7 @@ index 31dcdb3d61fa..222043217b7e 100644 -Werror=return-type -Wno-format-security \ -std=gnu89 KBUILD_CPPFLAGS := -D__KERNEL__ -@@ -1293,7 +1298,13 @@ define filechk_version.h +@@ -1295,7 +1300,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -176,10 +176,10 @@ index 31dcdb3d61fa..222043217b7e 100644 $(version_h): PATCHLEVEL := $(if $(PATCHLEVEL), $(PATCHLEVEL), 0) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 853aab5ab327..99cd243aed4e 100644 +index 5da96f5df48f..a35494d5910d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1474,9 +1474,9 @@ config HIGHMEM +@@ -1475,9 +1475,9 @@ config HIGHMEM If unsure, say n. config HIGHPTE @@ -192,7 +192,7 @@ index 853aab5ab327..99cd243aed4e 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 1f212b47a48a..7aa12d0eadec 100644 +index 5656e7aacd69..fb23ebe99efe 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -899,7 +899,7 @@ endchoice @@ -204,12 +204,12 @@ index 1f212b47a48a..7aa12d0eadec 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs -@@ -1158,6 +1158,7 @@ config XEN +@@ -1156,6 +1156,7 @@ config XEN config FORCE_MAX_ZONEORDER int - default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE) + default "14" if ARM64_64K_PAGES + default "13" if (ARCH_THUNDER && !ARM64_64K_PAGES && !RHEL_DIFFERENCES) - default "12" if (ARM64_16K_PAGES && TRANSPARENT_HUGEPAGE) + default "12" if ARM64_16K_PAGES default "11" help diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c |