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.patch28
1 files changed, 6 insertions, 22 deletions
diff --git a/patch-5.10.0-redhat.patch b/patch-5.10.0-redhat.patch
index ee09d51e2..624e0d5ac 100644
--- a/patch-5.10.0-redhat.patch
+++ b/patch-5.10.0-redhat.patch
@@ -13,7 +13,6 @@
arch/s390/kernel/setup.c | 4 +
arch/x86/kernel/cpu/common.c | 1 +
arch/x86/kernel/setup.c | 71 +++-
- crypto/aegis128-neon-inner.c | 4 +-
drivers/acpi/apei/hest.c | 8 +
drivers/acpi/irq.c | 17 +-
drivers/acpi/scan.c | 9 +
@@ -71,7 +70,7 @@
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
tools/perf/Makefile.config | 1 +
- 73 files changed, 1585 insertions(+), 191 deletions(-)
+ 72 files changed, 1583 insertions(+), 189 deletions(-)
diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
index 75a9dd98e76e..3ff3291551f9 100644
@@ -204,7 +203,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index ee2284a5cad2..2c08fcabe616 100644
+index 9e7fd6a065a7..cc3f21bf5d51 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -289,10 +288,10 @@ index a13d90206472..6a6aae01755b 100644
#define get_user(x, p) \
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index f858c352f72a..35579b9dd9a5 100644
+index 1d466addb078..516a53104f3e 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
-@@ -871,7 +871,7 @@ endchoice
+@@ -891,7 +891,7 @@ endchoice
config ARM64_FORCE_52BIT
bool "Force 52-bit virtual addresses for userspace"
@@ -301,7 +300,7 @@ index f858c352f72a..35579b9dd9a5 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
-@@ -1130,6 +1130,7 @@ config XEN
+@@ -1150,6 +1150,7 @@ config XEN
config FORCE_MAX_ZONEORDER
int
default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE)
@@ -501,21 +500,6 @@ index 84f581c91db4..1d510bd7c969 100644
unwind_init();
}
-diff --git a/crypto/aegis128-neon-inner.c b/crypto/aegis128-neon-inner.c
-index 2a660ac1bc3a..fa87ff6a2a71 100644
---- a/crypto/aegis128-neon-inner.c
-+++ b/crypto/aegis128-neon-inner.c
-@@ -148,8 +148,8 @@ void crypto_aegis128_init_neon(void *state, const void *key, const void *iv)
- kiv,
- vld1q_u8(const1),
- vld1q_u8(const0),
-- k ^ vld1q_u8(const0),
-- k ^ vld1q_u8(const1),
-+ (uint8x16_t) (k ^ vld1q_u8(const0)),
-+ (uint8x16_t) (k ^ vld1q_u8(const1)),
- }};
- int i;
-
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 6e980fe16772..37bc003e7a83 100644
--- a/drivers/acpi/apei/hest.c
@@ -2303,7 +2287,7 @@ index c503f7ab8afb..909e4fb32458 100644
*
* @perf_event_open:
diff --git a/include/linux/module.h b/include/linux/module.h
-index 7ccdf87f376f..bff07f39198d 100644
+index 6264617bab4d..d4202ef4c598 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -372,6 +372,7 @@ struct module {