summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2024-08-09 11:51:22 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2024-08-09 11:51:22 +0200
commit9f093012cd3decd2a4b81c67004d689a5ad0292d (patch)
tree0355857a5207603caeae59f226be5b6218c45975 /target/linux
parentc711de541fe8e719157f6d9bf9237d1cdef0fbbe (diff)
riscv: use v2 of the patch
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/patches/6.6.43/riscv-flat.patch34
1 files changed, 19 insertions, 15 deletions
diff --git a/target/linux/patches/6.6.43/riscv-flat.patch b/target/linux/patches/6.6.43/riscv-flat.patch
index 6d26c638f..b74f27e77 100644
--- a/target/linux/patches/6.6.43/riscv-flat.patch
+++ b/target/linux/patches/6.6.43/riscv-flat.patch
@@ -1,19 +1,23 @@
-diff -Nur linux-6.6.22.orig/fs/binfmt_flat.c linux-6.6.22/fs/binfmt_flat.c
---- linux-6.6.22.orig/fs/binfmt_flat.c 2024-03-15 19:25:07.000000000 +0100
-+++ linux-6.6.22/fs/binfmt_flat.c 2024-04-17 15:41:29.292461687 +0200
-@@ -879,6 +879,7 @@
- if (res < 0)
+diff -Nur linux-6.6.43.orig/fs/binfmt_flat.c linux-6.6.43/fs/binfmt_flat.c
+--- linux-6.6.43.orig/fs/binfmt_flat.c 2024-07-27 11:34:11.000000000 +0200
++++ linux-6.6.43/fs/binfmt_flat.c 2024-08-09 09:34:47.857536277 +0200
+@@ -72,8 +72,10 @@
+
+ #ifdef CONFIG_BINFMT_FLAT_NO_DATA_START_OFFSET
+ #define DATA_START_OFFSET_WORDS (0)
++#define MAX_SHARED_LIBS_UPDATE (0)
+ #else
+ #define DATA_START_OFFSET_WORDS (MAX_SHARED_LIBS)
++#define MAX_SHARED_LIBS_UPDATE (MAX_SHARED_LIBS)
+ #endif
+
+ struct lib_info {
+@@ -880,7 +882,7 @@
return res;
-+#ifndef CONFIG_BINFMT_FLAT_NO_DATA_START_OFFSET
/* Update data segment pointers for all libraries */
- for (i = 0; i < MAX_SHARED_LIBS; i++) {
+- for (i = 0; i < MAX_SHARED_LIBS; i++) {
++ for (i = 0; i < MAX_SHARED_LIBS_UPDATE; i++) {
if (!libinfo.lib_list[i].loaded)
-@@ -893,6 +894,7 @@
- return -EFAULT;
- }
- }
-+#endif
-
- set_binfmt(&flat_format);
-
+ continue;
+ for (j = 0; j < MAX_SHARED_LIBS; j++) {