diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2009-08-15 08:37:45 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2009-08-15 08:37:45 +0000 |
| commit | e59c6a8af27e57ab8316380d807ad49709df4508 (patch) | |
| tree | fc9141ace20a4ec3831968c0ad66c839716ff9ef /target/linux/generic-2.6 | |
| parent | b1ae2c2c20e7a7d51e86d4cf70feb61da3894754 (diff) | |
| download | upstream-e59c6a8af27e57ab8316380d807ad49709df4508.tar.gz upstream-e59c6a8af27e57ab8316380d807ad49709df4508.tar.bz2 upstream-e59c6a8af27e57ab8316380d807ad49709df4508.zip | |
refresh patches
SVN-Revision: 17268
Diffstat (limited to 'target/linux/generic-2.6')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch b/target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch index 54de43b905..ca87662676 100644 --- a/target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch +++ b/target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.30.4/arch/mips/Makefile -=================================================================== ---- linux-2.6.30.4.orig/arch/mips/Makefile 2009-08-06 16:02:25.000000000 +0200 -+++ linux-2.6.30.4/arch/mips/Makefile 2009-08-06 16:02:37.000000000 +0200 -@@ -83,7 +83,7 @@ +--- a/arch/mips/Makefile ++++ b/arch/mips/Makefile +@@ -83,7 +83,7 @@ all-$(CONFIG_BOOT_ELF64) := $(vmlinux-64 cflags-y += -G 0 -mno-abicalls -fno-pic -pipe cflags-y += -msoft-float LDFLAGS_vmlinux += -G 0 -static -n -nostdlib @@ -11,11 +9,9 @@ Index: linux-2.6.30.4/arch/mips/Makefile cflags-y += -ffreestanding -Index: linux-2.6.30.4/arch/mips/include/asm/module.h -=================================================================== ---- linux-2.6.30.4.orig/arch/mips/include/asm/module.h 2009-08-06 16:02:25.000000000 +0200 -+++ linux-2.6.30.4/arch/mips/include/asm/module.h 2009-08-06 16:02:37.000000000 +0200 -@@ -9,6 +9,11 @@ +--- a/arch/mips/include/asm/module.h ++++ b/arch/mips/include/asm/module.h +@@ -9,6 +9,11 @@ struct mod_arch_specific { struct list_head dbe_list; const struct exception_table_entry *dbe_start; const struct exception_table_entry *dbe_end; @@ -27,11 +23,9 @@ Index: linux-2.6.30.4/arch/mips/include/asm/module.h }; typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */ -Index: linux-2.6.30.4/arch/mips/kernel/module.c -=================================================================== ---- linux-2.6.30.4.orig/arch/mips/kernel/module.c 2009-08-06 16:02:36.000000000 +0200 -+++ linux-2.6.30.4/arch/mips/kernel/module.c 2009-08-06 16:03:15.000000000 +0200 -@@ -43,6 +43,116 @@ +--- a/arch/mips/kernel/module.c ++++ b/arch/mips/kernel/module.c +@@ -43,6 +43,116 @@ static struct mips_hi16 *mips_hi16_list; static LIST_HEAD(dbe_list); static DEFINE_SPINLOCK(dbe_lock); @@ -148,7 +142,7 @@ Index: linux-2.6.30.4/arch/mips/kernel/module.c void *module_alloc(unsigned long size) { #ifdef MODULE_START -@@ -58,16 +168,45 @@ +@@ -58,16 +168,45 @@ void *module_alloc(unsigned long size) return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL); #else @@ -196,7 +190,7 @@ Index: linux-2.6.30.4/arch/mips/kernel/module.c /* FIXME: If module_region == mod->init_region, trim exception table entries. */ } -@@ -75,6 +214,24 @@ +@@ -75,6 +214,24 @@ void module_free(struct module *mod, voi int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, char *secstrings, struct module *mod) { @@ -221,7 +215,7 @@ Index: linux-2.6.30.4/arch/mips/kernel/module.c return 0; } -@@ -97,27 +254,41 @@ +@@ -97,27 +254,41 @@ static int apply_r_mips_32_rela(struct m return 0; } @@ -277,7 +271,7 @@ Index: linux-2.6.30.4/arch/mips/kernel/module.c { if (v % 4) { printk(KERN_ERR "module %s: dangerous relocation\n", me->name); -@@ -125,17 +296,31 @@ +@@ -125,17 +296,31 @@ static int apply_r_mips_26_rela(struct m } if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { @@ -312,7 +306,7 @@ Index: linux-2.6.30.4/arch/mips/kernel/module.c static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v) { struct mips_hi16 *n; -@@ -400,11 +585,23 @@ +@@ -400,11 +585,23 @@ int module_finalize(const Elf_Ehdr *hdr, list_add(&me->arch.dbe_list, &dbe_list); spin_unlock_irq(&dbe_lock); } |