diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-04-24 14:49:08 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-04-24 14:49:08 +0000 |
| commit | 44adf3d959ad26b3681a7c96a6802f60579ac426 (patch) | |
| tree | 408b6abd03ee52ab15ec2d65306fd0a654aff017 | |
| parent | c2bf14deb99602780a71f9290d0936d143fb1a38 (diff) | |
| download | upstream-44adf3d959ad26b3681a7c96a6802f60579ac426.tar.gz upstream-44adf3d959ad26b3681a7c96a6802f60579ac426.tar.bz2 upstream-44adf3d959ad26b3681a7c96a6802f60579ac426.zip | |
generic/2.6.28: refresh patches
SVN-Revision: 15389
3 files changed, 9 insertions, 16 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch b/target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch index 3fac7aba43..f78bba8c94 100644 --- a/target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch +++ b/target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch @@ -1,8 +1,6 @@ -diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h -index a58378c..ce3b36e 100644 --- a/arch/arm/include/asm/elf.h +++ b/arch/arm/include/asm/elf.h -@@ -50,6 +50,7 @@ typedef struct user_fp elf_fpregset_t; +@@ -50,6 +50,7 @@ typedef struct user_fp elf_fpregset_t; #define R_ARM_ABS32 2 #define R_ARM_CALL 28 #define R_ARM_JUMP24 29 @@ -10,11 +8,9 @@ index a58378c..ce3b36e 100644 /* * These are used to set parameters in the core dumps. -diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c -index dab48f2..9f509fd 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c -@@ -132,6 +132,15 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, +@@ -132,6 +132,15 @@ apply_relocate(Elf32_Shdr *sechdrs, cons *(u32 *)loc |= offset & 0x00ffffff; break; @@ -30,4 +26,3 @@ index dab48f2..9f509fd 100644 default: printk(KERN_ERR "%s: unknown relocation: %u\n", module->name, ELF32_R_TYPE(rel->r_info)); - diff --git a/target/linux/generic-2.6/patches-2.6.28/977-textsearch_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.28/977-textsearch_kconfig_hacks.patch index 1ef893a728..aec5ac3214 100644 --- a/target/linux/generic-2.6/patches-2.6.28/977-textsearch_kconfig_hacks.patch +++ b/target/linux/generic-2.6/patches-2.6.28/977-textsearch_kconfig_hacks.patch @@ -1,6 +1,6 @@ ---- a/lib/Kconfig 2009-04-08 16:46:30.000000000 +0200 -+++ b/lib/Kconfig 2009-04-08 16:46:15.000000000 +0200 -@@ -119,16 +119,16 @@ +--- a/lib/Kconfig ++++ b/lib/Kconfig +@@ -119,16 +119,16 @@ config REED_SOLOMON_DEC16 # Textsearch support is select'ed if needed # config TEXTSEARCH diff --git a/target/linux/generic-2.6/patches-2.6.28/985-cris-headers.patch b/target/linux/generic-2.6/patches-2.6.28/985-cris-headers.patch index 3baa4cac59..73ede933ba 100644 --- a/target/linux/generic-2.6/patches-2.6.28/985-cris-headers.patch +++ b/target/linux/generic-2.6/patches-2.6.28/985-cris-headers.patch @@ -1,15 +1,13 @@ -diff -urN linux-2.6.28.clean/arch/cris/include/arch-v10/arch/Kbuild linux-2.6.28.mod/arch/cris/include/arch-v10/arch/Kbuild ---- linux-2.6.28.clean/arch/cris/include/arch-v10/arch/Kbuild 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28.mod/arch/cris/include/arch-v10/arch/Kbuild 2009-04-07 09:39:12.000000000 +0200 +--- a/arch/cris/include/arch-v10/arch/Kbuild ++++ b/arch/cris/include/arch-v10/arch/Kbuild @@ -1,3 +1,5 @@ +header-y += elf.h +header-y += ptrace.h header-y += user.h header-y += svinto.h header-y += sv_addr_ag.h -diff -urN linux-2.6.28.clean/arch/cris/include/asm/Kbuild linux-2.6.28.mod/arch/cris/include/asm/Kbuild ---- linux-2.6.28.clean/arch/cris/include/asm/Kbuild 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28.mod/arch/cris/include/asm/Kbuild 2009-04-07 10:53:34.000000000 +0200 +--- a/arch/cris/include/asm/Kbuild ++++ b/arch/cris/include/asm/Kbuild @@ -1,11 +1,14 @@ include include/asm-generic/Kbuild.asm |