KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refresh patches with -rc6

Browse source 
SVN-Revision: 25805
This commit is contained in:
Imre Kaloz 2011-03-01 11:24:08 +00:00
parent 783e064632
commit 1f5d24e562
17 changed files with 79 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
target/linux/generic/patches-2.6.38/008-jffs2_make_lzma_available.patch
View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/fs/jffs2/Kconfig --- a/fs/jffs2/Kconfig
=================================================================== +++ b/fs/jffs2/Kconfig
--- linux-2.6.38-rc6.orig/fs/jffs2/Kconfig 2011-02-22 02:25:52.000000000 +0100
+++ linux-2.6.38-rc6/fs/jffs2/Kconfig 2011-02-28 15:34:05.308257697 +0100
@@ -139,6 +139,15 @@ config JFFS2_LZO @@ -139,6 +139,15 @@ config JFFS2_LZO
This feature was added in July, 2007. Say 'N' if you need This feature was added in July, 2007. Say 'N' if you need
compatibility with older bootloaders or kernels. compatibility with older bootloaders or kernels.
@ -18,10 +16,8 @@ Index: linux-2.6.38-rc6/fs/jffs2/Kconfig
config JFFS2_RTIME config JFFS2_RTIME
bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS
depends on JFFS2_FS depends on JFFS2_FS
Index: linux-2.6.38-rc6/fs/jffs2/Makefile --- a/fs/jffs2/Makefile
=================================================================== +++ b/fs/jffs2/Makefile
--- linux-2.6.38-rc6.orig/fs/jffs2/Makefile 2011-02-22 02:25:52.000000000 +0100
+++ linux-2.6.38-rc6/fs/jffs2/Makefile 2011-02-28 15:34:05.308257697 +0100
@@ -18,4 +18,7 @@ jffs2-$(CONFIG_JFFS2_RUBIN) += compr_rub @@ -18,4 +18,7 @@ jffs2-$(CONFIG_JFFS2_RUBIN) += compr_rub
jffs2-$(CONFIG_JFFS2_RTIME) += compr_rtime.o jffs2-$(CONFIG_JFFS2_RTIME) += compr_rtime.o
jffs2-$(CONFIG_JFFS2_ZLIB) += compr_zlib.o jffs2-$(CONFIG_JFFS2_ZLIB) += compr_zlib.o
@ -30,10 +26,8 @@ Index: linux-2.6.38-rc6/fs/jffs2/Makefile
jffs2-$(CONFIG_JFFS2_SUMMARY) += summary.o jffs2-$(CONFIG_JFFS2_SUMMARY) += summary.o
+ +
+CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma +CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
Index: linux-2.6.38-rc6/fs/jffs2/compr.c --- a/fs/jffs2/compr.c
=================================================================== +++ b/fs/jffs2/compr.c
--- linux-2.6.38-rc6.orig/fs/jffs2/compr.c 2011-02-22 02:25:52.000000000 +0100
+++ linux-2.6.38-rc6/fs/jffs2/compr.c 2011-02-28 15:34:05.309257668 +0100
@@ -320,6 +320,9 @@ int __init jffs2_compressors_init(void) @@ -320,6 +320,9 @@ int __init jffs2_compressors_init(void)
#ifdef CONFIG_JFFS2_LZO #ifdef CONFIG_JFFS2_LZO
jffs2_lzo_init(); jffs2_lzo_init();
@ -54,10 +48,8 @@ Index: linux-2.6.38-rc6/fs/jffs2/compr.c
#ifdef CONFIG_JFFS2_LZO #ifdef CONFIG_JFFS2_LZO
jffs2_lzo_exit(); jffs2_lzo_exit();
#endif #endif
Index: linux-2.6.38-rc6/fs/jffs2/compr.h --- a/fs/jffs2/compr.h
=================================================================== +++ b/fs/jffs2/compr.h
--- linux-2.6.38-rc6.orig/fs/jffs2/compr.h 2011-02-22 02:25:52.000000000 +0100
+++ linux-2.6.38-rc6/fs/jffs2/compr.h 2011-02-28 15:34:05.309257668 +0100
@@ -29,9 +29,9 @@ @@ -29,9 +29,9 @@
#define JFFS2_DYNRUBIN_PRIORITY 20 #define JFFS2_DYNRUBIN_PRIORITY 20
#define JFFS2_LZARI_PRIORITY 30 #define JFFS2_LZARI_PRIORITY 30
@ -81,10 +73,8 @@ Index: linux-2.6.38-rc6/fs/jffs2/compr.h
+#endif +#endif
#endif /* __JFFS2_COMPR_H__ */ #endif /* __JFFS2_COMPR_H__ */
Index: linux-2.6.38-rc6/fs/jffs2/compr_lzma.c --- /dev/null
=================================================================== +++ b/fs/jffs2/compr_lzma.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.38-rc6/fs/jffs2/compr_lzma.c 2011-02-28 16:15:02.388304647 +0100
@@ -0,0 +1,128 @@ @@ -0,0 +1,128 @@
+/* +/*
+ * JFFS2 -- Journalling Flash File System, Version 2. + * JFFS2 -- Journalling Flash File System, Version 2.
@ -214,10 +204,8 @@ Index: linux-2.6.38-rc6/fs/jffs2/compr_lzma.c
+ jffs2_unregister_compressor(&jffs2_lzma_comp); + jffs2_unregister_compressor(&jffs2_lzma_comp);
+ lzma_free_workspace(); + lzma_free_workspace();
+} +}
Index: linux-2.6.38-rc6/fs/jffs2/super.c --- a/fs/jffs2/super.c
=================================================================== +++ b/fs/jffs2/super.c
--- linux-2.6.38-rc6.orig/fs/jffs2/super.c 2011-02-22 02:25:52.000000000 +0100
+++ linux-2.6.38-rc6/fs/jffs2/super.c 2011-02-28 15:34:05.310257639 +0100
@@ -255,14 +255,41 @@ static int __init init_jffs2_fs(void) @@ -255,14 +255,41 @@ static int __init init_jffs2_fs(void)
BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68); BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32); BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
@ -263,10 +251,8 @@ Index: linux-2.6.38-rc6/fs/jffs2/super.c
jffs2_inode_cachep = kmem_cache_create("jffs2_i", jffs2_inode_cachep = kmem_cache_create("jffs2_i",
sizeof(struct jffs2_inode_info), sizeof(struct jffs2_inode_info),
Index: linux-2.6.38-rc6/include/linux/jffs2.h --- a/include/linux/jffs2.h
=================================================================== +++ b/include/linux/jffs2.h
--- linux-2.6.38-rc6.orig/include/linux/jffs2.h 2011-02-22 02:25:52.000000000 +0100
+++ linux-2.6.38-rc6/include/linux/jffs2.h 2011-02-28 15:34:05.310257639 +0100
@@ -46,6 +46,7 @@ @@ -46,6 +46,7 @@
#define JFFS2_COMPR_DYNRUBIN 0x05 #define JFFS2_COMPR_DYNRUBIN 0x05
#define JFFS2_COMPR_ZLIB 0x06 #define JFFS2_COMPR_ZLIB 0x06
@ -275,10 +261,8 @@ Index: linux-2.6.38-rc6/include/linux/jffs2.h
/* Compatibility flags. */ /* Compatibility flags. */
#define JFFS2_COMPAT_MASK 0xc000 /* What do to if an unknown nodetype is found */ #define JFFS2_COMPAT_MASK 0xc000 /* What do to if an unknown nodetype is found */
#define JFFS2_NODE_ACCURATE 0x2000 #define JFFS2_NODE_ACCURATE 0x2000
Index: linux-2.6.38-rc6/include/linux/lzma.h --- /dev/null
=================================================================== +++ b/include/linux/lzma.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.38-rc6/include/linux/lzma.h 2011-02-28 15:34:05.310257639 +0100
@@ -0,0 +1,62 @@ @@ -0,0 +1,62 @@
+#ifndef __LZMA_H__ +#ifndef __LZMA_H__
+#define __LZMA_H__ +#define __LZMA_H__
@ -342,10 +326,8 @@ Index: linux-2.6.38-rc6/include/linux/lzma.h
+static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free}; +static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
+ +
+#endif +#endif
Index: linux-2.6.38-rc6/include/linux/lzma/LzFind.h --- /dev/null
=================================================================== +++ b/include/linux/lzma/LzFind.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.38-rc6/include/linux/lzma/LzFind.h 2011-02-28 16:14:14.392426757 +0100
@@ -0,0 +1,115 @@ @@ -0,0 +1,115 @@
+/* LzFind.h -- Match finder for LZ algorithms +/* LzFind.h -- Match finder for LZ algorithms
+2009-04-22 : Igor Pavlov : Public domain */ +2009-04-22 : Igor Pavlov : Public domain */
@ -462,10 +444,8 @@ Index: linux-2.6.38-rc6/include/linux/lzma/LzFind.h
+#endif +#endif
+ +
+#endif +#endif
Index: linux-2.6.38-rc6/include/linux/lzma/LzHash.h --- /dev/null
=================================================================== +++ b/include/linux/lzma/LzHash.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.38-rc6/include/linux/lzma/LzHash.h 2011-02-28 15:34:05.311257610 +0100
@@ -0,0 +1,54 @@ @@ -0,0 +1,54 @@
+/* LzHash.h -- HASH functions for LZ algorithms +/* LzHash.h -- HASH functions for LZ algorithms
+2009-02-07 : Igor Pavlov : Public domain */ +2009-02-07 : Igor Pavlov : Public domain */
@ -521,10 +501,8 @@ Index: linux-2.6.38-rc6/include/linux/lzma/LzHash.h
+ hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); } + hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
+ +
+#endif +#endif
Index: linux-2.6.38-rc6/include/linux/lzma/LzmaDec.h --- /dev/null
=================================================================== +++ b/include/linux/lzma/LzmaDec.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.38-rc6/include/linux/lzma/LzmaDec.h 2011-02-28 16:14:14.408426387 +0100
@@ -0,0 +1,231 @@ @@ -0,0 +1,231 @@
+/* LzmaDec.h -- LZMA Decoder +/* LzmaDec.h -- LZMA Decoder
+2009-02-07 : Igor Pavlov : Public domain */ +2009-02-07 : Igor Pavlov : Public domain */
@ -757,10 +735,8 @@ Index: linux-2.6.38-rc6/include/linux/lzma/LzmaDec.h
+#endif +#endif
+ +
+#endif +#endif
Index: linux-2.6.38-rc6/include/linux/lzma/LzmaEnc.h --- /dev/null
=================================================================== +++ b/include/linux/lzma/LzmaEnc.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.38-rc6/include/linux/lzma/LzmaEnc.h 2011-02-28 16:14:14.430425878 +0100
@@ -0,0 +1,80 @@ @@ -0,0 +1,80 @@
+/* LzmaEnc.h -- LZMA Encoder +/* LzmaEnc.h -- LZMA Encoder
+2009-02-07 : Igor Pavlov : Public domain */ +2009-02-07 : Igor Pavlov : Public domain */
@ -842,10 +818,8 @@ Index: linux-2.6.38-rc6/include/linux/lzma/LzmaEnc.h
+#endif +#endif
+ +
+#endif +#endif
Index: linux-2.6.38-rc6/include/linux/lzma/Types.h --- /dev/null
=================================================================== +++ b/include/linux/lzma/Types.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.38-rc6/include/linux/lzma/Types.h 2011-02-28 15:34:05.313257550 +0100
@@ -0,0 +1,226 @@ @@ -0,0 +1,226 @@
+/* Types.h -- Basic types +/* Types.h -- Basic types
+2009-11-23 : Igor Pavlov : Public domain */ +2009-11-23 : Igor Pavlov : Public domain */
@ -1073,10 +1047,8 @@ Index: linux-2.6.38-rc6/include/linux/lzma/Types.h
+EXTERN_C_END +EXTERN_C_END
+ +
+#endif +#endif
Index: linux-2.6.38-rc6/lib/Kconfig --- a/lib/Kconfig
=================================================================== +++ b/lib/Kconfig
--- linux-2.6.38-rc6.orig/lib/Kconfig 2011-02-22 02:25:52.000000000 +0100
+++ linux-2.6.38-rc6/lib/Kconfig 2011-02-28 16:14:00.063757281 +0100
@@ -108,6 +108,12 @@ config LZO_DECOMPRESS @@ -108,6 +108,12 @@ config LZO_DECOMPRESS
source "lib/xz/Kconfig" source "lib/xz/Kconfig"
@ -1090,10 +1062,8 @@ Index: linux-2.6.38-rc6/lib/Kconfig
# #
# These all provide a common interface (hence the apparent duplication with # These all provide a common interface (hence the apparent duplication with
# ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.) # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
Index: linux-2.6.38-rc6/lib/Makefile --- a/lib/Makefile
=================================================================== +++ b/lib/Makefile
--- linux-2.6.38-rc6.orig/lib/Makefile 2011-02-22 02:25:52.000000000 +0100
+++ linux-2.6.38-rc6/lib/Makefile 2011-02-28 15:34:05.313257550 +0100
@@ -2,6 +2,16 @@ @@ -2,6 +2,16 @@
# Makefile for some libs needed in the kernel. # Makefile for some libs needed in the kernel.
# #
@ -1120,10 +1090,8 @@ Index: linux-2.6.38-rc6/lib/Makefile
lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
Index: linux-2.6.38-rc6/lib/lzma/LzFind.c --- /dev/null
=================================================================== +++ b/lib/lzma/LzFind.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.38-rc6/lib/lzma/LzFind.c 2011-02-28 16:14:14.447425484 +0100
@@ -0,0 +1,761 @@ @@ -0,0 +1,761 @@
+/* LzFind.c -- Match finder for LZ algorithms +/* LzFind.c -- Match finder for LZ algorithms
+2009-04-22 : Igor Pavlov : Public domain */ +2009-04-22 : Igor Pavlov : Public domain */
@ -1886,10 +1854,8 @@ Index: linux-2.6.38-rc6/lib/lzma/LzFind.c
+ vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip; + vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
+ } + }
+} +}
Index: linux-2.6.38-rc6/lib/lzma/LzmaDec.c --- /dev/null
=================================================================== +++ b/lib/lzma/LzmaDec.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.38-rc6/lib/lzma/LzmaDec.c 2011-02-28 16:14:14.463425114 +0100
@@ -0,0 +1,999 @@ @@ -0,0 +1,999 @@
+/* LzmaDec.c -- LZMA Decoder +/* LzmaDec.c -- LZMA Decoder
+2009-09-20 : Igor Pavlov : Public domain */ +2009-09-20 : Igor Pavlov : Public domain */
@ -2890,10 +2856,8 @@ Index: linux-2.6.38-rc6/lib/lzma/LzmaDec.c
+ LzmaDec_FreeProbs(&p, alloc); + LzmaDec_FreeProbs(&p, alloc);
+ return res; + return res;
+} +}
Index: linux-2.6.38-rc6/lib/lzma/LzmaEnc.c --- /dev/null
=================================================================== +++ b/lib/lzma/LzmaEnc.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.38-rc6/lib/lzma/LzmaEnc.c 2011-02-28 16:14:14.485424605 +0100
@@ -0,0 +1,2271 @@ @@ -0,0 +1,2271 @@
+/* LzmaEnc.c -- LZMA Encoder +/* LzmaEnc.c -- LZMA Encoder
+2009-11-24 : Igor Pavlov : Public domain */ +2009-11-24 : Igor Pavlov : Public domain */
@ -5166,10 +5130,8 @@ Index: linux-2.6.38-rc6/lib/lzma/LzmaEnc.c
+ LzmaEnc_Destroy(p, alloc, allocBig); + LzmaEnc_Destroy(p, alloc, allocBig);
+ return res; + return res;
+} +}
Index: linux-2.6.38-rc6/lib/lzma/Makefile --- /dev/null
=================================================================== +++ b/lib/lzma/Makefile
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.38-rc6/lib/lzma/Makefile 2011-02-28 15:34:05.321257314 +0100
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
+lzma_compress-objs := LzFind.o LzmaEnc.o +lzma_compress-objs := LzFind.o LzmaEnc.o
+lzma_decompress-objs := LzmaDec.o +lzma_decompress-objs := LzmaDec.o

6
target/linux/generic/patches-2.6.38/010-debloat_lzma.patch
View file

@ -124,7 +124,7 @@
/* LzmaDecode /* LzmaDecode
--- a/lib/lzma/LzmaDec.c --- a/lib/lzma/LzmaDec.c
+++ b/lib/lzma/LzmaDec.c +++ b/lib/lzma/LzmaDec.c
@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, @@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p,
p->needFlush = 0; p->needFlush = 0;
} }
@ -194,7 +194,7 @@
{ {
CLzmaProps propNew; CLzmaProps propNew;
RINOK(LzmaProps_Decode(&propNew, props, propsSize)); RINOK(LzmaProps_Decode(&propNew, props, propsSize));
@@ -944,7 +944,7 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p, @@ -944,7 +944,7 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p,
return SZ_OK; return SZ_OK;
} }
@ -375,7 +375,7 @@
void MatchFinder_Construct(CMatchFinder *p); void MatchFinder_Construct(CMatchFinder *p);
/* Conditions: /* Conditions:
@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, @@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p,
UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter, UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
ISzAlloc *alloc); ISzAlloc *alloc);
void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc); void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);

8
target/linux/generic/patches-2.6.38/028-module_exports.patch
View file

@ -28,7 +28,7 @@
#ifndef SYMBOL_PREFIX #ifndef SYMBOL_PREFIX
#define VMLINUX_SYMBOL(sym) sym #define VMLINUX_SYMBOL(sym) sym
#else #else
@@ -276,35 +297,35 @@ @@ -274,35 +295,35 @@
/* Kernel symbol table: Normal symbols */ \ /* Kernel symbol table: Normal symbols */ \
__ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start___ksymtab) = .; \ VMLINUX_SYMBOL(__start___ksymtab) = .; \
@ -69,7 +69,7 @@
VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .; \ VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .; \
} \ } \
\ \
@@ -345,7 +366,7 @@ @@ -343,7 +364,7 @@
\ \
/* Kernel symbol table: strings */ \ /* Kernel symbol table: strings */ \
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \ __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \
@ -78,7 +78,7 @@
} \ } \
\ \
/* __*init sections */ \ /* __*init sections */ \
@@ -670,6 +691,9 @@ @@ -677,6 +698,9 @@
EXIT_TEXT \ EXIT_TEXT \
EXIT_DATA \ EXIT_DATA \
EXIT_CALL \ EXIT_CALL \
@ -90,7 +90,7 @@
} }
--- a/include/linux/module.h --- a/include/linux/module.h
+++ b/include/linux/module.h +++ b/include/linux/module.h
@@ -202,16 +202,24 @@ struct module_use { @@ -229,16 +229,24 @@ struct module_use {
#define __CRC_SYMBOL(sym, sec) #define __CRC_SYMBOL(sym, sec)
#endif #endif

2
target/linux/generic/patches-2.6.38/029-arm_module_unresolved_weak_sym.patch
View file

@ -1,6 +1,6 @@
--- a/arch/arm/kernel/module.c --- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c
@@ -97,6 +97,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons @@ -98,6 +98,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
return -ENOEXEC; return -ENOEXEC;
} }

42
target/linux/generic/patches-2.6.38/065-rootfs_split.patch
View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/drivers/mtd/Kconfig --- a/drivers/mtd/Kconfig
=================================================================== +++ b/drivers/mtd/Kconfig
--- linux-2.6.38-rc6.orig/drivers/mtd/Kconfig 2011-02-28 16:14:12.668466637 +0100
+++ linux-2.6.38-rc6/drivers/mtd/Kconfig 2011-02-28 16:26:55.463734599 +0100
@@ -55,6 +55,16 @@ config MTD_PARTITIONS @@ -55,6 +55,16 @@ config MTD_PARTITIONS
if MTD_PARTITIONS if MTD_PARTITIONS
@ -19,10 +17,8 @@ Index: linux-2.6.38-rc6/drivers/mtd/Kconfig
config MTD_REDBOOT_PARTS config MTD_REDBOOT_PARTS
tristate "RedBoot partition table parsing" tristate "RedBoot partition table parsing"
---help--- ---help---
Index: linux-2.6.38-rc6/drivers/mtd/mtdpart.c --- a/drivers/mtd/mtdpart.c
=================================================================== +++ b/drivers/mtd/mtdpart.c
--- linux-2.6.38-rc6.orig/drivers/mtd/mtdpart.c 2011-02-28 16:14:12.686466221 +0100
+++ linux-2.6.38-rc6/drivers/mtd/mtdpart.c 2011-02-28 16:28:41.399156164 +0100
@@ -29,6 +29,8 @@ @@ -29,6 +29,8 @@
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
@ -260,10 +256,8 @@ Index: linux-2.6.38-rc6/drivers/mtd/mtdpart.c
static DEFINE_SPINLOCK(part_parser_lock); static DEFINE_SPINLOCK(part_parser_lock);
static LIST_HEAD(part_parsers); static LIST_HEAD(part_parsers);
Index: linux-2.6.38-rc6/drivers/mtd/devices/block2mtd.c --- a/drivers/mtd/devices/block2mtd.c
=================================================================== +++ b/drivers/mtd/devices/block2mtd.c
--- linux-2.6.38-rc6.orig/drivers/mtd/devices/block2mtd.c 2011-02-28 16:15:07.477184360 +0100
+++ linux-2.6.38-rc6/drivers/mtd/devices/block2mtd.c 2011-02-28 16:26:55.919727057 +0100
@@ -30,6 +30,8 @@ struct block2mtd_dev { @@ -30,6 +30,8 @@ struct block2mtd_dev {
struct block_device *blkdev; struct block_device *blkdev;
struct mtd_info mtd; struct mtd_info mtd;
@ -552,10 +546,8 @@ Index: linux-2.6.38-rc6/drivers/mtd/devices/block2mtd.c
part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL); part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
part->name = dev->mtd.name; part->name = dev->mtd.name;
Index: linux-2.6.38-rc6/drivers/mtd/mtdchar.c --- a/drivers/mtd/mtdchar.c
=================================================================== +++ b/drivers/mtd/mtdchar.c
--- linux-2.6.38-rc6.orig/drivers/mtd/mtdchar.c 2011-02-28 16:14:12.652467007 +0100
+++ linux-2.6.38-rc6/drivers/mtd/mtdchar.c 2011-02-28 16:15:07.503183744 +0100
@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file, @@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file,
file->f_pos = 0; file->f_pos = 0;
break; break;
@ -570,10 +562,8 @@ Index: linux-2.6.38-rc6/drivers/mtd/mtdchar.c
case OTPGETREGIONCOUNT: case OTPGETREGIONCOUNT:
case OTPGETREGIONINFO: case OTPGETREGIONINFO:
Index: linux-2.6.38-rc6/include/linux/mtd/mtd.h --- a/include/linux/mtd/mtd.h
=================================================================== +++ b/include/linux/mtd/mtd.h
--- linux-2.6.38-rc6.orig/include/linux/mtd/mtd.h 2011-02-28 16:14:12.613467908 +0100
+++ linux-2.6.38-rc6/include/linux/mtd/mtd.h 2011-02-28 16:26:51.223804561 +0100
@@ -125,6 +125,7 @@ struct nand_ecclayout { @@ -125,6 +125,7 @@ struct nand_ecclayout {
struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES_LARGE]; struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES_LARGE];
}; };
@ -592,10 +582,8 @@ Index: linux-2.6.38-rc6/include/linux/mtd/mtd.h
/* If the driver is something smart, like UBI, it may need to maintain /* If the driver is something smart, like UBI, it may need to maintain
* its own reference counting. The below functions are only for driver. * its own reference counting. The below functions are only for driver.
* The driver may register its callbacks. These callbacks are not * The driver may register its callbacks. These callbacks are not
Index: linux-2.6.38-rc6/include/linux/mtd/partitions.h --- a/include/linux/mtd/partitions.h
=================================================================== +++ b/include/linux/mtd/partitions.h
--- linux-2.6.38-rc6.orig/include/linux/mtd/partitions.h 2011-02-28 16:14:12.635467400 +0100
+++ linux-2.6.38-rc6/include/linux/mtd/partitions.h 2011-02-28 16:26:55.382735938 +0100
@@ -34,12 +34,14 @@ @@ -34,12 +34,14 @@
* erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK). * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
*/ */
@ -619,10 +607,8 @@ Index: linux-2.6.38-rc6/include/linux/mtd/partitions.h
/* /*
* Functions dealing with the various ways of partitioning the space * Functions dealing with the various ways of partitioning the space
Index: linux-2.6.38-rc6/include/mtd/mtd-abi.h --- a/include/mtd/mtd-abi.h
=================================================================== +++ b/include/mtd/mtd-abi.h
--- linux-2.6.38-rc6.orig/include/mtd/mtd-abi.h 2011-02-28 16:14:12.596468301 +0100
+++ linux-2.6.38-rc6/include/mtd/mtd-abi.h 2011-02-28 16:15:07.505183696 +0100
@@ -127,6 +127,7 @@ struct otp_info { @@ -127,6 +127,7 @@ struct otp_info {
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64) #define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64) #define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)

6
target/linux/generic/patches-2.6.38/067-block2mtd_2.6.38_fix.patch
View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/drivers/mtd/devices/block2mtd.c --- a/drivers/mtd/devices/block2mtd.c
=================================================================== +++ b/drivers/mtd/devices/block2mtd.c
--- linux-2.6.38-rc6.orig/drivers/mtd/devices/block2mtd.c 2011-02-28 16:41:59.839603348 +0100
+++ linux-2.6.38-rc6/drivers/mtd/devices/block2mtd.c 2011-02-28 16:47:59.637698484 +0100
@@ -264,12 +264,13 @@ static int _open_bdev(struct block2mtd_d @@ -264,12 +264,13 @@ static int _open_bdev(struct block2mtd_d
bdev = blkdev_get_by_path(dev->devname, mode, dev); bdev = blkdev_get_by_path(dev->devname, mode, dev);
#ifndef MODULE #ifndef MODULE

2
target/linux/generic/patches-2.6.38/180-netfilter_depends.patch
View file

@ -8,7 +8,7 @@
depends on NETFILTER_ADVANCED depends on NETFILTER_ADVANCED
help help
H.323 is a VoIP signalling protocol from ITU-T. As one of the most H.323 is a VoIP signalling protocol from ITU-T. As one of the most
@@ -570,7 +569,6 @@ config NETFILTER_XT_TARGET_SECMARK @@ -558,7 +557,6 @@ config NETFILTER_XT_TARGET_SECMARK
config NETFILTER_XT_TARGET_TCPMSS config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support' tristate '"TCPMSS" target support'

6
target/linux/generic/patches-2.6.38/218-mini_fo_fix_2_6_38.patch
View file

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/fs/mini_fo/dentry.c --- a/fs/mini_fo/dentry.c
=================================================================== +++ b/fs/mini_fo/dentry.c
--- linux-2.6.38-rc6.orig/fs/mini_fo/dentry.c 2011-02-28 15:34:06.542221268 +0100
+++ linux-2.6.38-rc6/fs/mini_fo/dentry.c 2011-02-28 16:05:42.307346739 +0100
@@ -78,7 +78,7 @@ mini_fo_d_revalidate(dentry_t *dentry, i @@ -78,7 +78,7 @@ mini_fo_d_revalidate(dentry_t *dentry, i

2
target/linux/generic/patches-2.6.38/270-bridge_no_eap_forward.patch
View file

@ -12,4 +12,4 @@
+ } else if (is_multicast_ether_addr(dest)) { + } else if (is_multicast_ether_addr(dest)) {
mdst = br_mdb_get(br, skb); mdst = br_mdb_get(br, skb);
if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) { if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {
if ((mdst && !hlist_unhashed(&mdst->mglist)) || if ((mdst && mdst->mglist) ||

4
target/linux/generic/patches-2.6.38/290-sched_act_connmark.patch
View file

@ -140,7 +140,7 @@
+module_exit(connmark_cleanup_module); +module_exit(connmark_cleanup_module);
--- a/net/sched/Kconfig --- a/net/sched/Kconfig
+++ b/net/sched/Kconfig +++ b/net/sched/Kconfig
@@ -559,6 +559,18 @@ @@ -559,6 +559,18 @@ config NET_ACT_CSUM
To compile this code as a module, choose M here: the To compile this code as a module, choose M here: the
module will be called act_csum. module will be called act_csum.
@ -161,7 +161,7 @@
depends on NET_CLS_U32 || NET_CLS_FW depends on NET_CLS_U32 || NET_CLS_FW
--- a/net/sched/Makefile --- a/net/sched/Makefile
+++ b/net/sched/Makefile +++ b/net/sched/Makefile
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@ obj-$(CONFIG_NET_ACT_PEDIT) += act_pedit
obj-$(CONFIG_NET_ACT_SIMP) += act_simple.o obj-$(CONFIG_NET_ACT_SIMP) += act_simple.o
obj-$(CONFIG_NET_ACT_SKBEDIT) += act_skbedit.o obj-$(CONFIG_NET_ACT_SKBEDIT) += act_skbedit.o
obj-$(CONFIG_NET_ACT_CSUM) += act_csum.o obj-$(CONFIG_NET_ACT_CSUM) += act_csum.o

10
target/linux/generic/patches-2.6.38/300-bridge_port_isolate.patch
View file

@ -43,7 +43,7 @@
#endif #endif
--- a/net/bridge/br_input.c --- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c +++ b/net/bridge/br_input.c
@@ -91,7 +91,8 @@ int br_handle_frame_finish(struct sk_buf @@ -95,7 +95,8 @@ int br_handle_frame_finish(struct sk_buf
skb2 = skb; skb2 = skb;
br->dev->stats.multicast++; br->dev->stats.multicast++;
@ -55,7 +55,7 @@
skb = NULL; skb = NULL;
--- a/net/bridge/br_forward.c --- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c
@@ -113,7 +113,7 @@ void br_deliver(const struct net_bridge_ @@ -109,7 +109,7 @@ void br_deliver(const struct net_bridge_
/* called with rcu_read_lock */ /* called with rcu_read_lock */
void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk_buff *skb0) void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk_buff *skb0)
{ {
@ -64,7 +64,7 @@
if (skb0) if (skb0)
deliver_clone(to, skb, __br_forward); deliver_clone(to, skb, __br_forward);
else else
@@ -168,7 +168,8 @@ out: @@ -164,7 +164,8 @@ out:
static void br_flood(struct net_bridge *br, struct sk_buff *skb, static void br_flood(struct net_bridge *br, struct sk_buff *skb,
struct sk_buff *skb0, struct sk_buff *skb0,
void (*__packet_hook)(const struct net_bridge_port *p, void (*__packet_hook)(const struct net_bridge_port *p,
@ -74,7 +74,7 @@
{ {
struct net_bridge_port *p; struct net_bridge_port *p;
struct net_bridge_port *prev; struct net_bridge_port *prev;
@@ -176,6 +177,9 @@ static void br_flood(struct net_bridge * @@ -172,6 +173,9 @@ static void br_flood(struct net_bridge *
prev = NULL; prev = NULL;
list_for_each_entry_rcu(p, &br->port_list, list) { list_for_each_entry_rcu(p, &br->port_list, list) {
@ -84,7 +84,7 @@
prev = maybe_deliver(prev, p, skb, __packet_hook); prev = maybe_deliver(prev, p, skb, __packet_hook);
if (IS_ERR(prev)) if (IS_ERR(prev))
goto out; goto out;
@@ -199,14 +203,14 @@ out: @@ -195,14 +199,14 @@ out:
/* called with rcu_read_lock */ /* called with rcu_read_lock */
void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb) void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb)
{ {

2
target/linux/generic/patches-2.6.38/420-gpiodev.patch
View file

@ -17,7 +17,7 @@
depends on BLOCK depends on BLOCK
--- a/drivers/char/Makefile --- a/drivers/char/Makefile
+++ b/drivers/char/Makefile +++ b/drivers/char/Makefile
@@ -69,6 +69,7 @@ obj-$(CONFIG_NWFLASH) += nwflash.o @@ -70,6 +70,7 @@ obj-$(CONFIG_NWFLASH) += nwflash.o
obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o
obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o
obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o

2
target/linux/generic/patches-2.6.38/750-glamo-headers.patch
View file

@ -10,7 +10,7 @@
#define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */ #define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */
--- a/include/linux/Kbuild --- a/include/linux/Kbuild
+++ b/include/linux/Kbuild +++ b/include/linux/Kbuild
@@ -141,6 +141,8 @@ header-y += generic_serial.h @@ -142,6 +142,8 @@ header-y += generic_serial.h
header-y += genetlink.h header-y += genetlink.h
header-y += gfs2_ondisk.h header-y += gfs2_ondisk.h
header-y += gigaset_dev.h header-y += gigaset_dev.h

2
target/linux/generic/patches-2.6.38/801-usb_serial_endpoint_size.patch
View file

@ -17,7 +17,7 @@
port->bulk_in_size = buffer_size; port->bulk_in_size = buffer_size;
port->bulk_in_endpointAddress = endpoint->bEndpointAddress; port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL); port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
@@ -1388,3 +1389,5 @@ MODULE_LICENSE("GPL"); @@ -1392,3 +1393,5 @@ MODULE_LICENSE("GPL");
module_param(debug, bool, S_IRUGO | S_IWUSR); module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug enabled or not"); MODULE_PARM_DESC(debug, "Debug enabled or not");

2
target/linux/generic/patches-2.6.38/922-gpiommc.patch
View file

@ -829,7 +829,7 @@
+be done automatically. +be done automatically.
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -2855,6 +2855,11 @@ T: git git://git.kernel.org/pub/scm/linu @@ -2867,6 +2867,11 @@ T: git git://git.kernel.org/pub/scm/linu
S: Maintained S: Maintained
F: drivers/media/video/gspca/ F: drivers/media/video/gspca/

2
target/linux/generic/patches-2.6.38/970-ocf_kbuild_integration.patch
View file

@ -1,6 +1,6 @@
--- a/crypto/Kconfig --- a/crypto/Kconfig
+++ b/crypto/Kconfig +++ b/crypto/Kconfig
@@ -870,3 +870,6 @@ config CRYPTO_USER_API_SKCIPHER @@ -866,3 +866,6 @@ config CRYPTO_USER_API_SKCIPHER
source "drivers/crypto/Kconfig" source "drivers/crypto/Kconfig"
endif # if CRYPTO endif # if CRYPTO

2
target/linux/generic/patches-2.6.38/980-vm_exports.patch
View file

@ -94,7 +94,7 @@
/** /**
* zap_vma_ptes - remove ptes mapping the vma * zap_vma_ptes - remove ptes mapping the vma
@@ -2692,6 +2693,7 @@ int vmtruncate_range(struct inode *inode @@ -2690,6 +2691,7 @@ int vmtruncate_range(struct inode *inode
return 0; return 0;
} }