diff options
| author | Christian Marangi <ansuelsmth@gmail.com> | 2023-05-22 18:07:49 +0200 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-05-22 22:28:17 +0200 |
| commit | 4ed347aaad5de7b50d047f29aa99138b9b265daa (patch) | |
| tree | 5752ff821b8834c0ebd8fc7d77714f1879c98bc4 /target/linux/generic/pending-6.1/305-mips_module_reloc.patch | |
| parent | aa56d00aa624ffdc3ed839300d1284f890d31bf7 (diff) | |
| download | upstream-4ed347aaad5de7b50d047f29aa99138b9b265daa.tar.gz upstream-4ed347aaad5de7b50d047f29aa99138b9b265daa.tar.bz2 upstream-4ed347aaad5de7b50d047f29aa99138b9b265daa.zip | |
generic: 6.1: refresh pending patches
Refresh pending patches with make target/linux/refresh.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-6.1/305-mips_module_reloc.patch')
| -rw-r--r-- | target/linux/generic/pending-6.1/305-mips_module_reloc.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-6.1/305-mips_module_reloc.patch b/target/linux/generic/pending-6.1/305-mips_module_reloc.patch index bbea1f61c14..5de9019677e 100644 --- a/target/linux/generic/pending-6.1/305-mips_module_reloc.patch +++ b/target/linux/generic/pending-6.1/305-mips_module_reloc.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -98,8 +98,18 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin +@@ -97,8 +97,18 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin cflags-y += -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely cflags-y += -msoft-float LDFLAGS_vmlinux += -G 0 -static -n -nostdlib @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */ --- a/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c -@@ -31,23 +31,261 @@ struct mips_hi16 { +@@ -32,23 +32,261 @@ struct mips_hi16 { static LIST_HEAD(dbe_list); static DEFINE_SPINLOCK(dbe_lock); @@ -309,7 +309,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (v % 4) { pr_err("module %s: dangerous R_MIPS_26 relocation\n", me->name); -@@ -55,13 +293,17 @@ static int apply_r_mips_26(struct module +@@ -56,13 +294,17 @@ static int apply_r_mips_26(struct module } if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { @@ -331,7 +331,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> return 0; } -@@ -441,9 +683,36 @@ int module_finalize(const Elf_Ehdr *hdr, +@@ -442,9 +684,36 @@ int module_finalize(const Elf_Ehdr *hdr, list_add(&me->arch.dbe_list, &dbe_list); spin_unlock_irq(&dbe_lock); } |