summaryrefslogtreecommitdiffstats
path: root/patch-5.10.0-redhat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patch-5.10.0-redhat.patch')
-rw-r--r--patch-5.10.0-redhat.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/patch-5.10.0-redhat.patch b/patch-5.10.0-redhat.patch
index 1ef9802e7..71bed1c5d 100644
--- a/patch-5.10.0-redhat.patch
+++ b/patch-5.10.0-redhat.patch
@@ -202,7 +202,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index 43ecedeb3f02..d35dda518ef1 100644
+index 9ec53d947628..43dc30764eda 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -224,7 +224,7 @@ index 43ecedeb3f02..d35dda518ef1 100644
-Werror=return-type -Wno-format-security \
-std=gnu89
KBUILD_CPPFLAGS := -D__KERNEL__
-@@ -1245,7 +1250,13 @@ endef
+@@ -1253,7 +1258,13 @@ endef
define filechk_version.h
echo \#define LINUX_VERSION_CODE $(shell \
expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \
@@ -240,10 +240,10 @@ index 43ecedeb3f02..d35dda518ef1 100644
$(version_h): FORCE
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index fe2f17eb2b50..5bbcac6318a9 100644
+index 002e0cf025f5..0bd19ef73eec 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -1513,9 +1513,9 @@ config HIGHMEM
+@@ -1514,9 +1514,9 @@ config HIGHMEM
If unsure, say n.
config HIGHPTE
@@ -287,10 +287,10 @@ index a13d90206472..6a6aae01755b 100644
#define get_user(x, p) \
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 1515f6f153a0..b79d18fcd698 100644
+index a6b5b7ef40ae..6632e57859f5 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
-@@ -891,7 +891,7 @@ endchoice
+@@ -892,7 +892,7 @@ endchoice
config ARM64_FORCE_52BIT
bool "Force 52-bit virtual addresses for userspace"
@@ -299,7 +299,7 @@ index 1515f6f153a0..b79d18fcd698 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
-@@ -1150,6 +1150,7 @@ config XEN
+@@ -1151,6 +1151,7 @@ config XEN
config FORCE_MAX_ZONEORDER
int
default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE)