summaryrefslogtreecommitdiffstats
path: root/patch-5.12.0-redhat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patch-5.12.0-redhat.patch')
-rw-r--r--patch-5.12.0-redhat.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch
index d865f886d..58c257861 100644
--- a/patch-5.12.0-redhat.patch
+++ b/patch-5.12.0-redhat.patch
@@ -192,10 +192,10 @@ index 5da96f5df48f..a35494d5910d 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 5656e7aacd69..fb23ebe99efe 100644
+index e4e1b6550115..800dd64437a8 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
-@@ -899,7 +899,7 @@ endchoice
+@@ -909,7 +909,7 @@ endchoice
config ARM64_FORCE_52BIT
bool "Force 52-bit virtual addresses for userspace"
@@ -204,7 +204,7 @@ index 5656e7aacd69..fb23ebe99efe 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
-@@ -1156,6 +1156,7 @@ config XEN
+@@ -1166,6 +1166,7 @@ config XEN
config FORCE_MAX_ZONEORDER
int
default "14" if ARM64_64K_PAGES
@@ -2112,7 +2112,7 @@ index 320f1f3941b7..e3632573c1ed 100644
obj-$(CONFIG_MODULES) += kmod.o
obj-$(CONFIG_MULTIUSER) += groups.o
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index c859bc46d06c..1c6e78fa2b6d 100644
+index 250503482cda..dde01992df7e 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -24,6 +24,7 @@
@@ -2150,7 +2150,7 @@ index c859bc46d06c..1c6e78fa2b6d 100644
static const struct bpf_map_ops * const bpf_map_types[] = {
#define BPF_PROG_TYPE(_id, _name, prog_ctx_type, kern_ctx_type)
-@@ -4346,11 +4365,17 @@ static int bpf_prog_bind_map(union bpf_attr *attr)
+@@ -4351,11 +4370,17 @@ static int bpf_prog_bind_map(union bpf_attr *attr)
SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, size)
{
union bpf_attr attr;