ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-04 10:10:47 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

linux/generic: refresh 2.6.36 kernel patches

Browse Source 
SVN-Revision: 23237
This commit is contained in:
Alexandros C. Couloumbis 2010-10-05 08:50:54 +00:00
parent 978ecae685
commit 11c45f64fe
56 changed files with 270 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/generic/patches-2.6.36/005-squashfs_revert_to_2.6.35.patch
View File

@ -79,7 +79,7 @@
default n default n
help help
--- a/fs/squashfs/lzo_wrapper.c --- a/fs/squashfs/lzo_wrapper.c
+++ b/fs/squashfs/lzo_wrapper.c +++ /dev/null
@@ -1,136 +0,0 @@ @@ -1,136 +0,0 @@
-/* -/*
- * Squashfs - a compressed read only filesystem for Linux - * Squashfs - a compressed read only filesystem for Linux

2
target/linux/generic/patches-2.6.36/007-squashfs_make_lzma_available.patch
View File

@ -107,7 +107,7 @@ Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
+#endif +#endif
--- a/lib/Kconfig --- a/lib/Kconfig
+++ b/lib/Kconfig +++ b/lib/Kconfig
@@ -121,6 +121,9 @@ config DECOMPRESS_LZO @@ -124,6 +124,9 @@ config DECOMPRESS_LZO
select LZO_DECOMPRESS select LZO_DECOMPRESS
tristate tristate

12
target/linux/generic/patches-2.6.36/008-jffs2_make_lzma_available.patch
View File

@ -28,7 +28,7 @@
+CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma +CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
--- a/fs/jffs2/compr.c --- a/fs/jffs2/compr.c
+++ b/fs/jffs2/compr.c +++ b/fs/jffs2/compr.c
@@ -319,6 +319,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();
#endif #endif
@ -38,7 +38,7 @@
/* Setting default compression mode */ /* Setting default compression mode */
#ifdef CONFIG_JFFS2_CMODE_NONE #ifdef CONFIG_JFFS2_CMODE_NONE
jffs2_compression_mode = JFFS2_COMPR_MODE_NONE; jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
@@ -342,6 +345,9 @@ int __init jffs2_compressors_init(void) @@ -343,6 +346,9 @@ int __init jffs2_compressors_init(void)
int jffs2_compressors_exit(void) int jffs2_compressors_exit(void)
{ {
/* Unregistering compressors */ /* Unregistering compressors */
@ -50,7 +50,7 @@
#endif #endif
--- a/fs/jffs2/compr.h --- a/fs/jffs2/compr.h
+++ b/fs/jffs2/compr.h +++ b/fs/jffs2/compr.h
@@ -28,9 +28,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
#define JFFS2_RTIME_PRIORITY 50 #define JFFS2_RTIME_PRIORITY 50
@ -63,7 +63,7 @@
#define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */ #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */
#define JFFS2_DYNRUBIN_DISABLED /* for decompression */ #define JFFS2_DYNRUBIN_DISABLED /* for decompression */
@@ -98,5 +98,9 @@ void jffs2_zlib_exit(void); @@ -99,5 +99,9 @@ void jffs2_zlib_exit(void);
int jffs2_lzo_init(void); int jffs2_lzo_init(void);
void jffs2_lzo_exit(void); void jffs2_lzo_exit(void);
#endif #endif
@ -253,7 +253,7 @@
sizeof(struct jffs2_inode_info), sizeof(struct jffs2_inode_info),
--- a/include/linux/jffs2.h --- a/include/linux/jffs2.h
+++ b/include/linux/jffs2.h +++ b/include/linux/jffs2.h
@@ -45,6 +45,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
#define JFFS2_COMPR_LZO 0x07 #define JFFS2_COMPR_LZO 0x07
@ -1049,7 +1049,7 @@
+#endif +#endif
--- a/lib/Kconfig --- a/lib/Kconfig
+++ b/lib/Kconfig +++ b/lib/Kconfig
@@ -103,6 +103,12 @@ config LZO_COMPRESS @@ -106,6 +106,12 @@ config LZO_COMPRESS
config LZO_DECOMPRESS config LZO_DECOMPRESS
tristate tristate

4
target/linux/generic/patches-2.6.36/012-extra_optimization.patch
View File

@ -1,6 +1,6 @@
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -532,7 +532,7 @@ all: vmlinux @@ -537,7 +537,7 @@ all: vmlinux
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
KBUILD_CFLAGS += -Os KBUILD_CFLAGS += -Os
else else
@ -9,7 +9,7 @@
endif endif
include $(srctree)/arch/$(SRCARCH)/Makefile include $(srctree)/arch/$(SRCARCH)/Makefile
@@ -570,6 +570,9 @@ endif @@ -579,6 +579,9 @@ endif
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS) CHECKFLAGS += $(NOSTDINC_FLAGS)

4
target/linux/generic/patches-2.6.36/020-mips_multi_machine_support.patch
View File

@ -146,7 +146,7 @@
+} +}
--- a/arch/mips/kernel/Makefile --- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile
@@ -94,6 +94,7 @@ obj-$(CONFIG_GPIO_TXX9) += gpio_txx9.o @@ -95,6 +95,7 @@ obj-$(CONFIG_GPIO_TXX9) += gpio_txx9.o
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_SPINLOCK_TEST) += spinlock_test.o obj-$(CONFIG_SPINLOCK_TEST) += spinlock_test.o
@ -156,7 +156,7 @@
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -853,6 +853,9 @@ config MIPS_DISABLE_OBSOLETE_IDE @@ -874,6 +874,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
config SYNC_R4K config SYNC_R4K
bool bool

2
target/linux/generic/patches-2.6.36/021-mips_image_cmdline_hack.patch
View File

@ -1,6 +1,6 @@
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -856,6 +856,10 @@ config SYNC_R4K @@ -877,6 +877,10 @@ config SYNC_R4K
config MIPS_MACHINE config MIPS_MACHINE
def_bool n def_bool n

5
target/linux/generic/patches-2.6.36/025-mips_disable_fpu.patch
View File

@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
-- --
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -841,6 +841,17 @@ config I8259 @@ -862,6 +862,17 @@ config I8259
config MIPS_BONITO64 config MIPS_BONITO64
bool bool
@ -28,7 +28,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
--- a/arch/mips/math-emu/Makefile --- a/arch/mips/math-emu/Makefile
+++ b/arch/mips/math-emu/Makefile +++ b/arch/mips/math-emu/Makefile
@@ -2,12 +2,14 @@ @@ -2,11 +2,13 @@
# Makefile for the Linux/MIPS kernel FPU emulation. # Makefile for the Linux/MIPS kernel FPU emulation.
# #
@ -44,7 +44,6 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
- dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o - dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
+ dp_sqrt.o sp_sqrt.o + dp_sqrt.o sp_sqrt.o
EXTRA_CFLAGS += -Werror
--- a/arch/mips/math-emu/cp1emu.c --- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c +++ b/arch/mips/math-emu/cp1emu.c
@@ -58,7 +58,11 @@ @@ -58,7 +58,11 @@

8
target/linux/generic/patches-2.6.36/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
@@ -268,35 +289,35 @@ @@ -264,35 +285,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) = .; \
} \ } \
\ \
@@ -337,7 +358,7 @@ @@ -333,7 +354,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 */ \
@@ -652,6 +673,9 @@ @@ -648,6 +669,9 @@
EXIT_TEXT \ EXIT_TEXT \
EXIT_DATA \ EXIT_DATA \
EXIT_CALL \ EXIT_CALL \
@ -86,8 +86,8 @@
+ SYMTAB_DISCARD_GPL \ + SYMTAB_DISCARD_GPL \
+ SYMTAB_DISCARD_STR \ + SYMTAB_DISCARD_STR \
*(.discard) \ *(.discard) \
*(.discard.*) \
} }
--- 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 { @@ -202,16 +202,24 @@ struct module_use {

2
target/linux/generic/patches-2.6.36/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
@@ -121,6 +121,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons @@ -123,6 +123,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
return -ENOEXEC; return -ENOEXEC;
} }

8
target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch
View File

@ -15,15 +15,15 @@
default y default y
--- a/drivers/pci/quirks.c --- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c
@@ -91,6 +91,7 @@ static void __devinit quirk_resource_ali @@ -104,6 +104,7 @@ static void __devinit quirk_mmio_always_
} }
DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment); DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, quirk_mmio_always_on);
+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
/* The Mellanox Tavor device gives false positive parity errors /* The Mellanox Tavor device gives false positive parity errors
* Mark this device with a broken_parity_status, to allow * Mark this device with a broken_parity_status, to allow
* PCI scanning code to "skip" this now blacklisted device. * PCI scanning code to "skip" this now blacklisted device.
@@ -1904,7 +1905,9 @@ static void __devinit fixup_rev1_53c810( @@ -1923,7 +1924,9 @@ static void __devinit fixup_rev1_53c810(
} }
} }
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
@ -33,7 +33,7 @@
/* Enable 1k I/O space granularity on the Intel P64H2 */ /* Enable 1k I/O space granularity on the Intel P64H2 */
static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
{ {
@@ -2560,6 +2563,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I @@ -2596,6 +2599,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
#endif /* CONFIG_PCI_IOV */ #endif /* CONFIG_PCI_IOV */

4
target/linux/generic/patches-2.6.36/031-ppc_gcc_build_fix.patch
View File

@ -26,7 +26,7 @@ nice.
--- a/arch/powerpc/kernel/misc_32.S --- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S
@@ -822,3 +822,80 @@ relocate_new_kernel_end: @@ -825,3 +825,80 @@ relocate_new_kernel_end:
relocate_new_kernel_size: relocate_new_kernel_size:
.long relocate_new_kernel_end - relocate_new_kernel .long relocate_new_kernel_end - relocate_new_kernel
#endif #endif
@ -109,7 +109,7 @@ nice.
+#endif +#endif
--- a/arch/powerpc/kernel/ppc_ksyms.c --- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -190,3 +190,114 @@ EXPORT_SYMBOL(__mtdcr); @@ -186,3 +186,114 @@ EXPORT_SYMBOL(__mtdcr);
EXPORT_SYMBOL(__mfdcr); EXPORT_SYMBOL(__mfdcr);
#endif #endif
EXPORT_SYMBOL(empty_zero_page); EXPORT_SYMBOL(empty_zero_page);

2
target/linux/generic/patches-2.6.36/060-block2mtd_init.patch
View File

@ -105,7 +105,7 @@
{ {
--- a/fs/partitions/check.c --- a/fs/partitions/check.c
+++ b/fs/partitions/check.c +++ b/fs/partitions/check.c
@@ -677,6 +677,7 @@ rescan: @@ -690,6 +690,7 @@ rescan:
kfree(state); kfree(state);
return 0; return 0;
} }

4
target/linux/generic/patches-2.6.36/065-rootfs_split.patch
View File

@ -570,7 +570,7 @@
ret = -ENOTTY; ret = -ENOTTY;
--- a/include/linux/mtd/mtd.h --- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h
@@ -98,6 +98,7 @@ struct mtd_oob_ops { @@ -110,6 +110,7 @@ struct mtd_oob_ops {
uint8_t *oobbuf; uint8_t *oobbuf;
}; };
@ -578,7 +578,7 @@
struct mtd_info { struct mtd_info {
u_char type; u_char type;
uint32_t flags; uint32_t flags;
@@ -238,6 +239,9 @@ struct mtd_info { @@ -251,6 +252,9 @@ struct mtd_info {
struct device dev; struct device dev;
int usecount; int usecount;

2
target/linux/generic/patches-2.6.36/070-redboot_space.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/redboot.c --- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c +++ b/drivers/mtd/redboot.c
@@ -249,14 +249,21 @@ static int parse_redboot_partitions(stru @@ -267,14 +267,21 @@ static int parse_redboot_partitions(stru
#endif #endif
names += strlen(names)+1; names += strlen(names)+1;

10
target/linux/generic/patches-2.6.36/071-redboot_boardconfig.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/redboot.c --- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c +++ b/drivers/mtd/redboot.c
@@ -11,6 +11,8 @@ @@ -29,6 +29,8 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
@ -9,7 +9,7 @@
struct fis_image_desc { struct fis_image_desc {
unsigned char name[16]; // Null terminated name unsigned char name[16]; // Null terminated name
uint32_t flash_base; // Address within FLASH of image uint32_t flash_base; // Address within FLASH of image
@@ -41,6 +43,7 @@ static int parse_redboot_partitions(stru @@ -59,6 +61,7 @@ static int parse_redboot_partitions(stru
struct mtd_partition **pparts, struct mtd_partition **pparts,
unsigned long fis_origin) unsigned long fis_origin)
{ {
@ -17,7 +17,7 @@
int nrparts = 0; int nrparts = 0;
struct fis_image_desc *buf; struct fis_image_desc *buf;
struct mtd_partition *parts; struct mtd_partition *parts;
@@ -209,14 +212,14 @@ static int parse_redboot_partitions(stru @@ -227,14 +230,14 @@ static int parse_redboot_partitions(stru
} }
} }
#endif #endif
@ -34,7 +34,7 @@
#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
if (nulllen > 0) { if (nulllen > 0) {
strcpy(nullname, nullstring); strcpy(nullname, nullstring);
@@ -235,6 +238,8 @@ static int parse_redboot_partitions(stru @@ -253,6 +256,8 @@ static int parse_redboot_partitions(stru
} }
#endif #endif
for ( ; i<nrparts; i++) { for ( ; i<nrparts; i++) {
@ -43,7 +43,7 @@
parts[i].size = fl->img->size; parts[i].size = fl->img->size;
parts[i].offset = fl->img->flash_base; parts[i].offset = fl->img->flash_base;
parts[i].name = names; parts[i].name = names;
@@ -268,6 +273,14 @@ static int parse_redboot_partitions(stru @@ -286,6 +291,14 @@ static int parse_redboot_partitions(stru
fl = fl->next; fl = fl->next;
kfree(tmp_fl); kfree(tmp_fl);
} }

4
target/linux/generic/patches-2.6.36/080-mtd_plat_nand_chip_fixup.patch
View File

@ -5,7 +5,7 @@
--- a/include/linux/mtd/nand.h --- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h
@@ -512,6 +512,7 @@ struct platform_nand_chip { @@ -510,6 +510,7 @@ struct platform_nand_chip {
int chip_delay; int chip_delay;
unsigned int options; unsigned int options;
const char **part_probe_types; const char **part_probe_types;
@ -15,7 +15,7 @@
void *priv; void *priv;
--- a/drivers/mtd/nand/plat_nand.c --- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c +++ b/drivers/mtd/nand/plat_nand.c
@@ -91,7 +91,18 @@ static int __devinit plat_nand_probe(str @@ -96,7 +96,18 @@ static int __devinit plat_nand_probe(str
} }
/* Scan to find existance of the device */ /* Scan to find existance of the device */

4
target/linux/generic/patches-2.6.36/100-netfilter_layer7_2.21.patch
View File

@ -41,7 +41,7 @@
--- a/net/netfilter/Kconfig --- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig
@@ -921,6 +921,27 @@ config NETFILTER_XT_MATCH_STATE @@ -946,6 +946,27 @@ config NETFILTER_XT_MATCH_STATE
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.
@ -71,7 +71,7 @@
depends on NETFILTER_ADVANCED depends on NETFILTER_ADVANCED
--- a/net/netfilter/Makefile --- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile +++ b/net/netfilter/Makefile
@@ -91,6 +91,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) @@ -95,6 +95,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o

10
target/linux/generic/patches-2.6.36/110-netfilter_match_speedup.patch
View File

@ -124,7 +124,7 @@
pr_debug("Entering %s(hook %u); sp at %u (UF %p)\n", pr_debug("Entering %s(hook %u); sp at %u (UF %p)\n",
table->name, hook, origptr, table->name, hook, origptr,
get_entry(table_base, private->underflow[hook])); get_entry(table_base, private->underflow[hook]));
@@ -970,6 +1010,7 @@ copy_entries_to_user(unsigned int total_ @@ -974,6 +1014,7 @@ copy_entries_to_user(unsigned int total_
unsigned int i; unsigned int i;
const struct ipt_entry_match *m; const struct ipt_entry_match *m;
const struct ipt_entry_target *t; const struct ipt_entry_target *t;
@ -132,10 +132,11 @@
e = (struct ipt_entry *)(loc_cpu_entry + off); e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off if (copy_to_user(userptr + off
@@ -980,6 +1021,14 @@ copy_entries_to_user(unsigned int total_ @@ -983,6 +1024,14 @@ copy_entries_to_user(unsigned int total_
ret = -EFAULT;
goto free_counters; goto free_counters;
} }
+
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH; + flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
+ if (copy_to_user(userptr + off + if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags), + + offsetof(struct ipt_entry, ip.flags),
@ -143,7 +144,6 @@
+ ret = -EFAULT; + ret = -EFAULT;
+ goto free_counters; + goto free_counters;
+ } + }
+
for (i = sizeof(struct ipt_entry); for (i = sizeof(struct ipt_entry);
i < e->target_offset; i < e->target_offset;
i += m->u.match_size) {

4
target/linux/generic/patches-2.6.36/180-netfilter_depends.patch
View File

@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig --- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig
@@ -173,7 +173,6 @@ config NF_CONNTRACK_FTP @@ -152,7 +152,6 @@ config NF_CONNTRACK_FTP
config NF_CONNTRACK_H323 config NF_CONNTRACK_H323
tristate "H.323 protocol support" tristate "H.323 protocol support"
@ -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
@@ -550,7 +549,6 @@ config NETFILTER_XT_TARGET_SECMARK @@ -557,7 +556,6 @@ config NETFILTER_XT_TARGET_SECMARK
config NETFILTER_XT_TARGET_TCPMSS config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support' tristate '"TCPMSS" target support'

2
target/linux/generic/patches-2.6.36/190-netfilter_rtsp.patch
View File

@ -304,7 +304,7 @@
obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
--- a/net/netfilter/Kconfig --- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig
@@ -280,6 +280,16 @@ config NF_CONNTRACK_TFTP @@ -259,6 +259,16 @@ config NF_CONNTRACK_TFTP
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.

2
target/linux/generic/patches-2.6.36/204-jffs2_eofdetect.patch
View File

@ -1,6 +1,6 @@
--- a/fs/jffs2/build.c --- a/fs/jffs2/build.c
+++ b/fs/jffs2/build.c +++ b/fs/jffs2/build.c
@@ -111,6 +111,17 @@ static int jffs2_build_filesystem(struct @@ -112,6 +112,17 @@ static int jffs2_build_filesystem(struct
dbg_fsbuild("scanned flash completely\n"); dbg_fsbuild("scanned flash completely\n");
jffs2_dbg_dump_block_lists_nolock(c); jffs2_dbg_dump_block_lists_nolock(c);

6
target/linux/generic/patches-2.6.36/209-mini_fo.patch
View File

@ -7492,7 +7492,7 @@
+ +
--- /dev/null --- /dev/null
+++ b/fs/mini_fo/super.c +++ b/fs/mini_fo/super.c
@@ -0,0 +1,285 @@ @@ -0,0 +1,281 @@
+/* +/*
+ * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2003 Erez Zadok
+ * Copyright (c) 2001-2003 Stony Brook University + * Copyright (c) 2001-2003 Stony Brook University
@ -7665,11 +7665,7 @@
+ struct dentry *hidden_d; + struct dentry *hidden_d;
+ +
+ hidden_d = dtohd(d); + hidden_d = dtohd(d);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+ err = statfs_by_dentry(hidden_d, buf);
+#else
+ err = vfs_statfs(hidden_d, buf); + err = vfs_statfs(hidden_d, buf);
+#endif
+#else +#else
+ super_block_t *hidden_sb; + super_block_t *hidden_sb;
+ +

10
target/linux/generic/patches-2.6.36/222-partial_eraseblock_write.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/mtdpart.c --- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c
@@ -21,6 +21,8 @@ @@ -32,6 +32,8 @@
#include <linux/root_dev.h> #include <linux/root_dev.h>
#include <linux/magic.h> #include <linux/magic.h>
@ -9,7 +9,7 @@
/* Our partition linked list */ /* Our partition linked list */
static LIST_HEAD(mtd_partitions); static LIST_HEAD(mtd_partitions);
@@ -226,13 +228,60 @@ static int part_erase(struct mtd_info *m @@ -237,13 +239,60 @@ static int part_erase(struct mtd_info *m
return -EROFS; return -EROFS;
if (instr->addr >= mtd->size) if (instr->addr >= mtd->size)
return -EINVAL; return -EINVAL;
@ -70,7 +70,7 @@
return ret; return ret;
} }
@@ -240,7 +289,25 @@ void mtd_erase_callback(struct erase_inf @@ -251,7 +300,25 @@ void mtd_erase_callback(struct erase_inf
{ {
if (instr->mtd->erase == part_erase) { if (instr->mtd->erase == part_erase) {
struct mtd_part *part = PART(instr->mtd); struct mtd_part *part = PART(instr->mtd);
@ -96,7 +96,7 @@
if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN) if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
instr->fail_addr -= part->offset; instr->fail_addr -= part->offset;
instr->addr -= part->offset; instr->addr -= part->offset;
@@ -473,18 +540,24 @@ static struct mtd_part *add_one_partitio @@ -494,18 +561,24 @@ static struct mtd_part *add_one_partitio
if ((slave->mtd.flags & MTD_WRITEABLE) && if ((slave->mtd.flags & MTD_WRITEABLE) &&
mtd_mod_by_eb(slave->offset, &slave->mtd)) { mtd_mod_by_eb(slave->offset, &slave->mtd)) {
/* Doesn't start on a boundary of major erase size */ /* Doesn't start on a boundary of major erase size */
@ -133,7 +133,7 @@
if (master->block_isbad) { if (master->block_isbad) {
--- a/include/linux/mtd/mtd.h --- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h
@@ -45,6 +45,10 @@ struct erase_info { @@ -57,6 +57,10 @@ struct erase_info {
u_long priv; u_long priv;
u_char state; u_char state;
struct erase_info *next; struct erase_info *next;

24
target/linux/generic/patches-2.6.36/240-packet_socket_type.patch
View File

@ -26,15 +26,15 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
unsigned int tp_packets; unsigned int tp_packets;
--- a/net/packet/af_packet.c --- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c +++ b/net/packet/af_packet.c
@@ -203,6 +203,7 @@ struct packet_sock { @@ -205,6 +205,7 @@ struct packet_sock {
unsigned int tp_reserve;
unsigned int tp_loss:1; unsigned int tp_loss:1;
unsigned int tp_tstamp;
struct packet_type prot_hook ____cacheline_aligned_in_smp; struct packet_type prot_hook ____cacheline_aligned_in_smp;
+ unsigned int pkt_type; + unsigned int pkt_type;
}; };
struct packet_skb_cb { struct packet_skb_cb {
@@ -339,6 +340,7 @@ static int packet_rcv_spkt(struct sk_buf @@ -341,6 +342,7 @@ static int packet_rcv_spkt(struct sk_buf
{ {
struct sock *sk; struct sock *sk;
struct sockaddr_pkt *spkt; struct sockaddr_pkt *spkt;
@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/* /*
* When we registered the protocol we saved the socket in the data * When we registered the protocol we saved the socket in the data
@@ -346,6 +348,7 @@ static int packet_rcv_spkt(struct sk_buf @@ -348,6 +350,7 @@ static int packet_rcv_spkt(struct sk_buf
*/ */
sk = pt->af_packet_priv; sk = pt->af_packet_priv;
@ -50,7 +50,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/* /*
* Yank back the headers [hope the device set this * Yank back the headers [hope the device set this
@@ -358,7 +361,7 @@ static int packet_rcv_spkt(struct sk_buf @@ -360,7 +363,7 @@ static int packet_rcv_spkt(struct sk_buf
* so that this procedure is noop. * so that this procedure is noop.
*/ */
@ -59,7 +59,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
goto out; goto out;
if (!net_eq(dev_net(dev), sock_net(sk))) if (!net_eq(dev_net(dev), sock_net(sk)))
@@ -537,12 +540,12 @@ static int packet_rcv(struct sk_buff *sk @@ -539,12 +542,12 @@ static int packet_rcv(struct sk_buff *sk
int skb_len = skb->len; int skb_len = skb->len;
unsigned int snaplen, res; unsigned int snaplen, res;
@ -75,9 +75,9 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!net_eq(dev_net(dev), sock_net(sk))) if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop; goto drop;
@@ -657,12 +660,12 @@ static int tpacket_rcv(struct sk_buff *s @@ -660,12 +663,12 @@ static int tpacket_rcv(struct sk_buff *s
struct timeval tv;
struct timespec ts; struct timespec ts;
struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);
- if (skb->pkt_type == PACKET_LOOPBACK) - if (skb->pkt_type == PACKET_LOOPBACK)
- goto drop; - goto drop;
@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!net_eq(dev_net(dev), sock_net(sk))) if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop; goto drop;
@@ -1473,6 +1476,7 @@ static int packet_create(struct net *net @@ -1488,6 +1491,7 @@ static int packet_create(struct net *net
spin_lock_init(&po->bind_lock); spin_lock_init(&po->bind_lock);
mutex_init(&po->pg_vec_lock); mutex_init(&po->pg_vec_lock);
po->prot_hook.func = packet_rcv; po->prot_hook.func = packet_rcv;
@ -99,8 +99,8 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (sock->type == SOCK_PACKET) if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt; po->prot_hook.func = packet_rcv_spkt;
@@ -2027,6 +2031,16 @@ packet_setsockopt(struct socket *sock, i @@ -2054,6 +2058,16 @@ packet_setsockopt(struct socket *sock, i
po->has_vnet_hdr = !!val; po->tp_tstamp = val;
return 0; return 0;
} }
+ case PACKET_RECV_TYPE: + case PACKET_RECV_TYPE:
@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
default: default:
return -ENOPROTOOPT; return -ENOPROTOOPT;
} }
@@ -2084,6 +2098,13 @@ static int packet_getsockopt(struct sock @@ -2111,6 +2125,13 @@ static int packet_getsockopt(struct sock
data = &val; data = &val;
break; break;

4
target/linux/generic/patches-2.6.36/250-pppoe_header_pad.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/pppoe.c --- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c
@@ -856,7 +856,7 @@ static int pppoe_sendmsg(struct kiocb *i @@ -855,7 +855,7 @@ static int pppoe_sendmsg(struct kiocb *i
goto end; goto end;
@ -9,7 +9,7 @@
0, GFP_KERNEL); 0, GFP_KERNEL);
if (!skb) { if (!skb) {
error = -ENOMEM; error = -ENOMEM;
@@ -864,7 +864,7 @@ static int pppoe_sendmsg(struct kiocb *i @@ -863,7 +863,7 @@ static int pppoe_sendmsg(struct kiocb *i
} }
/* Reserve space for headers. */ /* Reserve space for headers. */

8
target/linux/generic/patches-2.6.36/260-crypto_optional_tests.patch
View File

@ -1,8 +1,8 @@
--- a/crypto/Kconfig --- a/crypto/Kconfig
+++ b/crypto/Kconfig +++ b/crypto/Kconfig
@@ -104,6 +104,10 @@ config CRYPTO_MANAGER_TESTS @@ -109,6 +109,10 @@ config CRYPTO_MANAGER_DISABLE_TESTS
Run cryptomanager's tests for the new crypto algorithms being Disable run-time self tests that normally take place at
registered. algorithm registration.
+config CRYPTO_MANAGER_NO_TESTS +config CRYPTO_MANAGER_NO_TESTS
+ bool "Disable internal testsuite to save space" + bool "Disable internal testsuite to save space"
@ -43,7 +43,7 @@
+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */ +#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
} }
#endif /* CONFIG_CRYPTO_MANAGER_TESTS */ #endif /* CONFIG_CRYPTO_MANAGER_DISABLE_TESTS */
--- a/crypto/testmgr.h --- a/crypto/testmgr.h
+++ b/crypto/testmgr.h +++ b/crypto/testmgr.h
@@ -20,6 +20,8 @@ @@ -20,6 +20,8 @@

4
target/linux/generic/patches-2.6.36/400-ledtrig_morse.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/leds/Kconfig --- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig
@@ -371,4 +371,8 @@ endif # LEDS_TRIGGERS @@ -380,4 +380,8 @@ endif # LEDS_TRIGGERS
endif # LEDS_CLASS endif # LEDS_CLASS
@ -11,7 +11,7 @@
endif # NEW_LEDS endif # NEW_LEDS
--- a/drivers/leds/Makefile --- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile +++ b/drivers/leds/Makefile
@@ -48,3 +48,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += @@ -49,3 +49,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) +=
obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o
obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o

7
target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch
View File

@ -21,12 +21,9 @@
+obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o +obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
--- a/drivers/leds/ledtrig-netdev.c --- a/drivers/leds/ledtrig-netdev.c
+++ b/drivers/leds/ledtrig-netdev.c +++ b/drivers/leds/ledtrig-netdev.c
@@ -307,8 +307,9 @@ done: @@ -309,6 +309,7 @@ static void netdev_trig_timer(unsigned l
static void netdev_trig_timer(unsigned long arg)
{
struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg; struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
- const struct net_device_stats *dev_stats; const struct net_device_stats *dev_stats;
+ struct rtnl_link_stats64 *dev_stats;
unsigned new_activity; unsigned new_activity;
+ struct rtnl_link_stats64 temp; + struct rtnl_link_stats64 temp;

6
target/linux/generic/patches-2.6.36/410-gpio_buttons.patch
View File

@ -1,8 +1,8 @@
--- a/drivers/input/misc/Kconfig --- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig
@@ -390,4 +390,20 @@ config INPUT_PCAP @@ -438,4 +438,20 @@ config INPUT_ADXL34X_SPI
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called pcap_keys. module will be called adxl34x-spi.
+config INPUT_GPIO_BUTTONS +config INPUT_GPIO_BUTTONS
+ tristate "Polled GPIO buttons interface" + tristate "Polled GPIO buttons interface"
@ -23,7 +23,7 @@
endif endif
--- a/drivers/input/misc/Makefile --- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile +++ b/drivers/input/misc/Makefile
@@ -37,4 +37,5 @@ obj-$(CONFIG_INPUT_WINBOND_CIR) += winb @@ -41,4 +41,5 @@ obj-$(CONFIG_INPUT_WINBOND_CIR) += winb
obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o
obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o
obj-$(CONFIG_INPUT_YEALINK) += yealink.o obj-$(CONFIG_INPUT_YEALINK) += yealink.o

2
target/linux/generic/patches-2.6.36/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
@@ -96,6 +96,7 @@ obj-$(CONFIG_SCx200_GPIO) += scx200_gpio @@ -98,6 +98,7 @@ obj-$(CONFIG_SCx200_GPIO) += scx200_gpio
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
obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o

8
target/linux/generic/patches-2.6.36/511-yaffs-cvs-2009-04-24.patch
View File

@ -11038,14 +11038,14 @@
+ yaffs_UnpackTags2(tags, &pt); + yaffs_UnpackTags2(tags, &pt);
+ } + }
+ } + }
+
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+ if (localData) + if (localData)
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__); + yaffs_ReleaseTempBuffer(dev, data, __LINE__);
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR) + if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED; tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-
if (retval == 0) if (retval == 0)
return YAFFS_OK; return YAFFS_OK;
else else

250
target/linux/generic/patches-2.6.36/511-yaffs-git-2010-10-01.patch
View File

@ -1,6 +1,5 @@
diff -Nrup a/fs/yaffs2/devextras.h b/fs/yaffs2/devextras.h --- a/fs/yaffs2/devextras.h
--- a/fs/yaffs2/devextras.h 2010-10-03 17:48:22.704000363 +0300 +++ b/fs/yaffs2/devextras.h
+++ b/fs/yaffs2/devextras.h 2010-10-03 18:03:47.537000367 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -123,9 +122,8 @@ diff -Nrup a/fs/yaffs2/devextras.h b/fs/yaffs2/devextras.h
#if !(defined __KERNEL__) #if !(defined __KERNEL__)
diff -Nrup a/fs/yaffs2/Kconfig b/fs/yaffs2/Kconfig --- a/fs/yaffs2/Kconfig
--- a/fs/yaffs2/Kconfig 2010-10-03 17:48:22.704000363 +0300 +++ b/fs/yaffs2/Kconfig
+++ b/fs/yaffs2/Kconfig 2010-10-03 18:03:47.461000368 +0300
@@ -90,23 +90,15 @@ config YAFFS_AUTO_YAFFS2 @@ -90,23 +90,15 @@ config YAFFS_AUTO_YAFFS2
If unsure, say Y. If unsure, say Y.
@ -203,9 +201,8 @@ diff -Nrup a/fs/yaffs2/Kconfig b/fs/yaffs2/Kconfig
+ If unsure, say Y. + If unsure, say Y.
+ +
+ +
diff -Nrup a/fs/yaffs2/Makefile b/fs/yaffs2/Makefile --- a/fs/yaffs2/Makefile
--- a/fs/yaffs2/Makefile 2010-10-03 17:48:22.705000363 +0300 +++ b/fs/yaffs2/Makefile
+++ b/fs/yaffs2/Makefile 2010-10-03 18:03:47.460000369 +0300
@@ -4,7 +4,14 @@ @@ -4,7 +4,14 @@
obj-$(CONFIG_YAFFS_FS) += yaffs.o obj-$(CONFIG_YAFFS_FS) += yaffs.o
@ -223,9 +220,8 @@ diff -Nrup a/fs/yaffs2/Makefile b/fs/yaffs2/Makefile
+yaffs-y += yaffs_bitmap.o +yaffs-y += yaffs_bitmap.o
+yaffs-y += yaffs_verify.o +yaffs-y += yaffs_verify.o
+ +
diff -Nrup a/fs/yaffs2/moduleconfig.h b/fs/yaffs2/moduleconfig.h --- a/fs/yaffs2/moduleconfig.h
--- a/fs/yaffs2/moduleconfig.h 2010-10-03 17:48:22.705000363 +0300 +++ b/fs/yaffs2/moduleconfig.h
+++ b/fs/yaffs2/moduleconfig.h 2010-10-03 18:03:47.538000366 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -285,9 +281,8 @@ diff -Nrup a/fs/yaffs2/moduleconfig.h b/fs/yaffs2/moduleconfig.h
/* /*
Older-style on-NAND data format has a "pageStatus" byte to record Older-style on-NAND data format has a "pageStatus" byte to record
diff -Nrup a/fs/yaffs2/yaffs_allocator.c b/fs/yaffs2/yaffs_allocator.c --- /dev/null
--- a/fs/yaffs2/yaffs_allocator.c 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_allocator.c
+++ b/fs/yaffs2/yaffs_allocator.c 2010-10-03 18:03:47.504000356 +0300
@@ -0,0 +1,409 @@ @@ -0,0 +1,409 @@
+/* +/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -698,9 +693,8 @@ diff -Nrup a/fs/yaffs2/yaffs_allocator.c b/fs/yaffs2/yaffs_allocator.c
+ +
+ +
+#endif +#endif
diff -Nrup a/fs/yaffs2/yaffs_allocator.h b/fs/yaffs2/yaffs_allocator.h --- /dev/null
--- a/fs/yaffs2/yaffs_allocator.h 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_allocator.h
+++ b/fs/yaffs2/yaffs_allocator.h 2010-10-03 18:03:47.538000366 +0300
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
+/* +/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -732,9 +726,8 @@ diff -Nrup a/fs/yaffs2/yaffs_allocator.h b/fs/yaffs2/yaffs_allocator.h
+void yaffs_FreeRawObject(yaffs_Device *dev, yaffs_Object *obj); +void yaffs_FreeRawObject(yaffs_Device *dev, yaffs_Object *obj);
+ +
+#endif +#endif
diff -Nrup a/fs/yaffs2/yaffs_bitmap.c b/fs/yaffs2/yaffs_bitmap.c --- /dev/null
--- a/fs/yaffs2/yaffs_bitmap.c 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_bitmap.c
+++ b/fs/yaffs2/yaffs_bitmap.c 2010-10-03 18:03:47.505000364 +0300
@@ -0,0 +1,105 @@ @@ -0,0 +1,105 @@
+/* +/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -841,9 +834,8 @@ diff -Nrup a/fs/yaffs2/yaffs_bitmap.c b/fs/yaffs2/yaffs_bitmap.c
+ return n; + return n;
+} +}
+ +
diff -Nrup a/fs/yaffs2/yaffs_bitmap.h b/fs/yaffs2/yaffs_bitmap.h --- /dev/null
--- a/fs/yaffs2/yaffs_bitmap.h 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_bitmap.h
+++ b/fs/yaffs2/yaffs_bitmap.h 2010-10-03 18:03:47.539000363 +0300
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
+/* +/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -876,9 +868,8 @@ diff -Nrup a/fs/yaffs2/yaffs_bitmap.h b/fs/yaffs2/yaffs_bitmap.h
+int yaffs_CountChunkBits(yaffs_Device *dev, int blk); +int yaffs_CountChunkBits(yaffs_Device *dev, int blk);
+ +
+#endif +#endif
diff -Nrup a/fs/yaffs2/yaffs_checkptrw.c b/fs/yaffs2/yaffs_checkptrw.c --- a/fs/yaffs2/yaffs_checkptrw.c
--- a/fs/yaffs2/yaffs_checkptrw.c 2010-10-03 17:48:22.706000363 +0300 +++ b/fs/yaffs2/yaffs_checkptrw.c
+++ b/fs/yaffs2/yaffs_checkptrw.c 2010-10-03 18:03:47.505000364 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -1210,9 +1201,8 @@ diff -Nrup a/fs/yaffs2/yaffs_checkptrw.c b/fs/yaffs2/yaffs_checkptrw.c
} }
diff -Nrup a/fs/yaffs2/yaffs_checkptrw.h b/fs/yaffs2/yaffs_checkptrw.h --- a/fs/yaffs2/yaffs_checkptrw.h
--- a/fs/yaffs2/yaffs_checkptrw.h 2010-10-03 17:48:22.706000363 +0300 +++ b/fs/yaffs2/yaffs_checkptrw.h
+++ b/fs/yaffs2/yaffs_checkptrw.h 2010-10-03 18:03:47.540000359 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -1247,9 +1237,8 @@ diff -Nrup a/fs/yaffs2/yaffs_checkptrw.h b/fs/yaffs2/yaffs_checkptrw.h
#endif #endif
- -
diff -Nrup a/fs/yaffs2/yaffs_ecc.c b/fs/yaffs2/yaffs_ecc.c --- a/fs/yaffs2/yaffs_ecc.c
--- a/fs/yaffs2/yaffs_ecc.c 2010-10-03 17:48:22.706000363 +0300 +++ b/fs/yaffs2/yaffs_ecc.c
+++ b/fs/yaffs2/yaffs_ecc.c 2010-10-03 18:03:47.509000373 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -1269,9 +1258,8 @@ diff -Nrup a/fs/yaffs2/yaffs_ecc.c b/fs/yaffs2/yaffs_ecc.c
#include "yportenv.h" #include "yportenv.h"
#include "yaffs_ecc.h" #include "yaffs_ecc.h"
diff -Nrup a/fs/yaffs2/yaffs_ecc.h b/fs/yaffs2/yaffs_ecc.h --- a/fs/yaffs2/yaffs_ecc.h
--- a/fs/yaffs2/yaffs_ecc.h 2010-10-03 17:48:22.707000363 +0300 +++ b/fs/yaffs2/yaffs_ecc.h
+++ b/fs/yaffs2/yaffs_ecc.h 2010-10-03 18:03:47.541000359 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -1281,9 +1269,8 @@ diff -Nrup a/fs/yaffs2/yaffs_ecc.h b/fs/yaffs2/yaffs_ecc.h
* for Toby Churchill Ltd and Brightstar Engineering * for Toby Churchill Ltd and Brightstar Engineering
* *
* Created by Charles Manning <charles@aleph1.co.uk> * Created by Charles Manning <charles@aleph1.co.uk>
diff -Nrup a/fs/yaffs2/yaffs_fs.c b/fs/yaffs2/yaffs_fs.c --- a/fs/yaffs2/yaffs_fs.c
--- a/fs/yaffs2/yaffs_fs.c 2010-10-03 17:48:22.708000363 +0300 +++ /dev/null
+++ b/fs/yaffs2/yaffs_fs.c 1970-01-01 02:00:00.000000000 +0200
@@ -1,2529 +0,0 @@ @@ -1,2529 +0,0 @@
-/* -/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. - * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -3814,9 +3801,8 @@ diff -Nrup a/fs/yaffs2/yaffs_fs.c b/fs/yaffs2/yaffs_fs.c
-MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system"); -MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system");
-MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2006"); -MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2006");
-MODULE_LICENSE("GPL"); -MODULE_LICENSE("GPL");
diff -Nrup a/fs/yaffs2/yaffs_getblockinfo.h b/fs/yaffs2/yaffs_getblockinfo.h --- a/fs/yaffs2/yaffs_getblockinfo.h
--- a/fs/yaffs2/yaffs_getblockinfo.h 2010-10-03 17:48:22.710000363 +0300 +++ b/fs/yaffs2/yaffs_getblockinfo.h
+++ b/fs/yaffs2/yaffs_getblockinfo.h 2010-10-03 18:03:47.542000362 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -3834,9 +3820,8 @@ diff -Nrup a/fs/yaffs2/yaffs_getblockinfo.h b/fs/yaffs2/yaffs_getblockinfo.h
/* Function to manipulate block info */ /* Function to manipulate block info */
static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk) static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
diff -Nrup a/fs/yaffs2/yaffs_guts.c b/fs/yaffs2/yaffs_guts.c --- a/fs/yaffs2/yaffs_guts.c
--- a/fs/yaffs2/yaffs_guts.c 2010-10-03 17:48:22.715000364 +0300 +++ b/fs/yaffs2/yaffs_guts.c
+++ b/fs/yaffs2/yaffs_guts.c 2010-10-03 18:03:47.518000364 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -14389,9 +14374,8 @@ diff -Nrup a/fs/yaffs2/yaffs_guts.c b/fs/yaffs2/yaffs_guts.c
#ifndef CONFIG_YAFFS_WINCE #ifndef CONFIG_YAFFS_WINCE
yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader"); yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader");
#endif #endif
diff -Nrup a/fs/yaffs2/yaffs_guts.h b/fs/yaffs2/yaffs_guts.h --- a/fs/yaffs2/yaffs_guts.h
--- a/fs/yaffs2/yaffs_guts.h 2010-10-03 17:48:22.718000363 +0300 +++ b/fs/yaffs2/yaffs_guts.h
+++ b/fs/yaffs2/yaffs_guts.h 2010-10-03 18:03:47.542000362 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -14983,9 +14967,8 @@ diff -Nrup a/fs/yaffs2/yaffs_guts.h b/fs/yaffs2/yaffs_guts.h
+__u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos); +__u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos);
+ +
#endif #endif
diff -Nrup a/fs/yaffs2/yaffsinterface.h b/fs/yaffs2/yaffsinterface.h --- a/fs/yaffs2/yaffsinterface.h
--- a/fs/yaffs2/yaffsinterface.h 2010-10-03 17:29:32.916000361 +0300 +++ b/fs/yaffs2/yaffsinterface.h
+++ b/fs/yaffs2/yaffsinterface.h 2010-10-03 18:03:47.543000365 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -14995,9 +14978,8 @@ diff -Nrup a/fs/yaffs2/yaffsinterface.h b/fs/yaffs2/yaffsinterface.h
* for Toby Churchill Ltd and Brightstar Engineering * for Toby Churchill Ltd and Brightstar Engineering
* *
* Created by Charles Manning <charles@aleph1.co.uk> * Created by Charles Manning <charles@aleph1.co.uk>
diff -Nrup a/fs/yaffs2/yaffs_linux_allocator.c b/fs/yaffs2/yaffs_linux_allocator.c --- /dev/null
--- a/fs/yaffs2/yaffs_linux_allocator.c 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_linux_allocator.c
+++ b/fs/yaffs2/yaffs_linux_allocator.c 2010-10-03 18:03:47.519000366 +0300
@@ -0,0 +1,200 @@ @@ -0,0 +1,200 @@
+/* +/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -15199,9 +15181,8 @@ diff -Nrup a/fs/yaffs2/yaffs_linux_allocator.c b/fs/yaffs2/yaffs_linux_allocator
+ yaffs_Allocator *allocator = dev->allocator; + yaffs_Allocator *allocator = dev->allocator;
+ kmem_cache_free(allocator->object_cache,obj); + kmem_cache_free(allocator->object_cache,obj);
+} +}
diff -Nrup a/fs/yaffs2/yaffs_linux.h b/fs/yaffs2/yaffs_linux.h --- /dev/null
--- a/fs/yaffs2/yaffs_linux.h 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_linux.h
+++ b/fs/yaffs2/yaffs_linux.h 2010-10-03 18:03:47.544000367 +0300
@@ -0,0 +1,43 @@ @@ -0,0 +1,43 @@
+/* +/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -15246,9 +15227,8 @@ diff -Nrup a/fs/yaffs2/yaffs_linux.h b/fs/yaffs2/yaffs_linux.h
+ +
+#endif +#endif
+ +
diff -Nrup a/fs/yaffs2/yaffs_list.h b/fs/yaffs2/yaffs_list.h --- /dev/null
--- a/fs/yaffs2/yaffs_list.h 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_list.h
+++ b/fs/yaffs2/yaffs_list.h 2010-10-03 18:03:47.544000367 +0300
@@ -0,0 +1,127 @@ @@ -0,0 +1,127 @@
+/* +/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -15377,9 +15357,8 @@ diff -Nrup a/fs/yaffs2/yaffs_list.h b/fs/yaffs2/yaffs_list.h
+ +
+ +
+#endif +#endif
diff -Nrup a/fs/yaffs2/yaffs_mtdif1.c b/fs/yaffs2/yaffs_mtdif1.c --- a/fs/yaffs2/yaffs_mtdif1.c
--- a/fs/yaffs2/yaffs_mtdif1.c 2010-10-03 17:48:22.719000363 +0300 +++ b/fs/yaffs2/yaffs_mtdif1.c
+++ b/fs/yaffs2/yaffs_mtdif1.c 2010-10-03 18:03:47.519000366 +0300
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
* YAFFS: Yet another FFS. A NAND-flash specific file system. * YAFFS: Yet another FFS. A NAND-flash specific file system.
* yaffs_mtdif1.c NAND mtd interface functions for small-page NAND. * yaffs_mtdif1.c NAND mtd interface functions for small-page NAND.
@ -15522,9 +15501,8 @@ diff -Nrup a/fs/yaffs2/yaffs_mtdif1.c b/fs/yaffs2/yaffs_mtdif1.c
state = YAFFS_BLOCK_STATE_DEAD; state = YAFFS_BLOCK_STATE_DEAD;
} else if (etags.eccResult != YAFFS_ECC_RESULT_NO_ERROR) { } else if (etags.eccResult != YAFFS_ECC_RESULT_NO_ERROR) {
/* bad tags, need to look more closely */ /* bad tags, need to look more closely */
diff -Nrup a/fs/yaffs2/yaffs_mtdif1-compat.c b/fs/yaffs2/yaffs_mtdif1-compat.c --- a/fs/yaffs2/yaffs_mtdif1-compat.c
--- a/fs/yaffs2/yaffs_mtdif1-compat.c 2010-10-03 17:29:32.916000361 +0300 +++ /dev/null
+++ b/fs/yaffs2/yaffs_mtdif1-compat.c 1970-01-01 02:00:00.000000000 +0200
@@ -1,434 +0,0 @@ @@ -1,434 +0,0 @@
-From ian@brightstareng.com Fri May 18 15:06:49 2007 -From ian@brightstareng.com Fri May 18 15:06:49 2007
-From ian@brightstareng.com Fri May 18 15:08:21 2007 -From ian@brightstareng.com Fri May 18 15:08:21 2007
@ -15960,9 +15938,8 @@ diff -Nrup a/fs/yaffs2/yaffs_mtdif1-compat.c b/fs/yaffs2/yaffs_mtdif1-compat.c
- -
- -
- -
diff -Nrup a/fs/yaffs2/yaffs_mtdif1.h b/fs/yaffs2/yaffs_mtdif1.h --- a/fs/yaffs2/yaffs_mtdif1.h
--- a/fs/yaffs2/yaffs_mtdif1.h 2010-10-03 17:48:22.719000363 +0300 +++ b/fs/yaffs2/yaffs_mtdif1.h
+++ b/fs/yaffs2/yaffs_mtdif1.h 2010-10-03 18:03:47.545000367 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System. A NAND-flash specific file system. * YAFFS: Yet another Flash File System. A NAND-flash specific file system.
@ -15972,9 +15949,8 @@ diff -Nrup a/fs/yaffs2/yaffs_mtdif1.h b/fs/yaffs2/yaffs_mtdif1.h
* for Toby Churchill Ltd and Brightstar Engineering * for Toby Churchill Ltd and Brightstar Engineering
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
diff -Nrup a/fs/yaffs2/yaffs_mtdif2.c b/fs/yaffs2/yaffs_mtdif2.c --- a/fs/yaffs2/yaffs_mtdif2.c
--- a/fs/yaffs2/yaffs_mtdif2.c 2010-10-03 17:48:22.720000363 +0300 +++ b/fs/yaffs2/yaffs_mtdif2.c
+++ b/fs/yaffs2/yaffs_mtdif2.c 2010-10-03 18:03:47.520000367 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -16221,9 +16197,8 @@ diff -Nrup a/fs/yaffs2/yaffs_mtdif2.c b/fs/yaffs2/yaffs_mtdif2.c
&t); &t);
if (t.chunkUsed) { if (t.chunkUsed) {
diff -Nrup a/fs/yaffs2/yaffs_mtdif2.h b/fs/yaffs2/yaffs_mtdif2.h --- a/fs/yaffs2/yaffs_mtdif2.h
--- a/fs/yaffs2/yaffs_mtdif2.h 2010-10-03 17:48:22.720000363 +0300 +++ b/fs/yaffs2/yaffs_mtdif2.h
+++ b/fs/yaffs2/yaffs_mtdif2.h 2010-10-03 18:03:47.545000367 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -16233,9 +16208,8 @@ diff -Nrup a/fs/yaffs2/yaffs_mtdif2.h b/fs/yaffs2/yaffs_mtdif2.h
* for Toby Churchill Ltd and Brightstar Engineering * for Toby Churchill Ltd and Brightstar Engineering
* *
* Created by Charles Manning <charles@aleph1.co.uk> * Created by Charles Manning <charles@aleph1.co.uk>
diff -Nrup a/fs/yaffs2/yaffs_mtdif.c b/fs/yaffs2/yaffs_mtdif.c --- a/fs/yaffs2/yaffs_mtdif.c
--- a/fs/yaffs2/yaffs_mtdif.c 2010-10-03 17:48:22.720000363 +0300 +++ b/fs/yaffs2/yaffs_mtdif.c
+++ b/fs/yaffs2/yaffs_mtdif.c 2010-10-03 18:03:47.521000367 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -16470,9 +16444,8 @@ diff -Nrup a/fs/yaffs2/yaffs_mtdif.c b/fs/yaffs2/yaffs_mtdif.c
retval = mtd->erase(mtd, &ei); retval = mtd->erase(mtd, &ei);
if (retval == 0) if (retval == 0)
diff -Nrup a/fs/yaffs2/yaffs_mtdif.h b/fs/yaffs2/yaffs_mtdif.h --- a/fs/yaffs2/yaffs_mtdif.h
--- a/fs/yaffs2/yaffs_mtdif.h 2010-10-03 17:48:22.721000363 +0300 +++ b/fs/yaffs2/yaffs_mtdif.h
+++ b/fs/yaffs2/yaffs_mtdif.h 2010-10-03 18:03:47.546000366 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -16494,9 +16467,8 @@ diff -Nrup a/fs/yaffs2/yaffs_mtdif.h b/fs/yaffs2/yaffs_mtdif.h
int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber); int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber);
int nandmtd_InitialiseNAND(yaffs_Device *dev); int nandmtd_InitialiseNAND(yaffs_Device *dev);
#endif #endif
diff -Nrup a/fs/yaffs2/yaffs_nameval.c b/fs/yaffs2/yaffs_nameval.c --- /dev/null
--- a/fs/yaffs2/yaffs_nameval.c 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_nameval.c
+++ b/fs/yaffs2/yaffs_nameval.c 2010-10-03 18:03:47.523000363 +0300
@@ -0,0 +1,197 @@ @@ -0,0 +1,197 @@
+/* +/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -16695,9 +16667,8 @@ diff -Nrup a/fs/yaffs2/yaffs_nameval.c b/fs/yaffs2/yaffs_nameval.c
+{ +{
+ return nval_used(xb, xb_size) > 0; + return nval_used(xb, xb_size) > 0;
+} +}
diff -Nrup a/fs/yaffs2/yaffs_nameval.h b/fs/yaffs2/yaffs_nameval.h --- /dev/null
--- a/fs/yaffs2/yaffs_nameval.h 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_nameval.h
+++ b/fs/yaffs2/yaffs_nameval.h 2010-10-03 18:03:47.546000366 +0300
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
+/* +/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -16724,9 +16695,8 @@ diff -Nrup a/fs/yaffs2/yaffs_nameval.h b/fs/yaffs2/yaffs_nameval.h
+int nval_list(const char *xb, int xb_size, char *buf, int bsize); +int nval_list(const char *xb, int xb_size, char *buf, int bsize);
+int nval_hasvalues(const char *xb, int xb_size); +int nval_hasvalues(const char *xb, int xb_size);
+#endif +#endif
diff -Nrup a/fs/yaffs2/yaffs_nand.c b/fs/yaffs2/yaffs_nand.c --- a/fs/yaffs2/yaffs_nand.c
--- a/fs/yaffs2/yaffs_nand.c 2010-10-03 17:48:22.721000363 +0300 +++ b/fs/yaffs2/yaffs_nand.c
+++ b/fs/yaffs2/yaffs_nand.c 2010-10-03 18:03:47.524000359 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -16840,9 +16810,8 @@ diff -Nrup a/fs/yaffs2/yaffs_nand.c b/fs/yaffs2/yaffs_nand.c
} }
diff -Nrup a/fs/yaffs2/yaffs_nandemul2k.h b/fs/yaffs2/yaffs_nandemul2k.h --- a/fs/yaffs2/yaffs_nandemul2k.h
--- a/fs/yaffs2/yaffs_nandemul2k.h 2010-10-03 17:48:22.721000364 +0300 +++ b/fs/yaffs2/yaffs_nandemul2k.h
+++ b/fs/yaffs2/yaffs_nandemul2k.h 2010-10-03 18:03:47.546000366 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -16852,9 +16821,8 @@ diff -Nrup a/fs/yaffs2/yaffs_nandemul2k.h b/fs/yaffs2/yaffs_nandemul2k.h
* for Toby Churchill Ltd and Brightstar Engineering * for Toby Churchill Ltd and Brightstar Engineering
* *
* Created by Charles Manning <charles@aleph1.co.uk> * Created by Charles Manning <charles@aleph1.co.uk>
diff -Nrup a/fs/yaffs2/yaffs_nand.h b/fs/yaffs2/yaffs_nand.h --- a/fs/yaffs2/yaffs_nand.h
--- a/fs/yaffs2/yaffs_nand.h 2010-10-03 17:48:22.721000364 +0300 +++ b/fs/yaffs2/yaffs_nand.h
+++ b/fs/yaffs2/yaffs_nand.h 2010-10-03 18:03:47.547000363 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -16864,9 +16832,8 @@ diff -Nrup a/fs/yaffs2/yaffs_nand.h b/fs/yaffs2/yaffs_nand.h
* for Toby Churchill Ltd and Brightstar Engineering * for Toby Churchill Ltd and Brightstar Engineering
* *
* Created by Charles Manning <charles@aleph1.co.uk> * Created by Charles Manning <charles@aleph1.co.uk>
diff -Nrup a/fs/yaffs2/yaffs_packedtags1.c b/fs/yaffs2/yaffs_packedtags1.c --- a/fs/yaffs2/yaffs_packedtags1.c
--- a/fs/yaffs2/yaffs_packedtags1.c 2010-10-03 17:48:22.721000364 +0300 +++ b/fs/yaffs2/yaffs_packedtags1.c
+++ b/fs/yaffs2/yaffs_packedtags1.c 2010-10-03 18:03:47.524000359 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -16876,9 +16843,8 @@ diff -Nrup a/fs/yaffs2/yaffs_packedtags1.c b/fs/yaffs2/yaffs_packedtags1.c
* for Toby Churchill Ltd and Brightstar Engineering * for Toby Churchill Ltd and Brightstar Engineering
* *
* Created by Charles Manning <charles@aleph1.co.uk> * Created by Charles Manning <charles@aleph1.co.uk>
diff -Nrup a/fs/yaffs2/yaffs_packedtags1.h b/fs/yaffs2/yaffs_packedtags1.h --- a/fs/yaffs2/yaffs_packedtags1.h
--- a/fs/yaffs2/yaffs_packedtags1.h 2010-10-03 17:48:22.721000364 +0300 +++ b/fs/yaffs2/yaffs_packedtags1.h
+++ b/fs/yaffs2/yaffs_packedtags1.h 2010-10-03 18:03:47.547000363 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -16888,9 +16854,8 @@ diff -Nrup a/fs/yaffs2/yaffs_packedtags1.h b/fs/yaffs2/yaffs_packedtags1.h
* for Toby Churchill Ltd and Brightstar Engineering * for Toby Churchill Ltd and Brightstar Engineering
* *
* Created by Charles Manning <charles@aleph1.co.uk> * Created by Charles Manning <charles@aleph1.co.uk>
diff -Nrup a/fs/yaffs2/yaffs_packedtags2.c b/fs/yaffs2/yaffs_packedtags2.c --- a/fs/yaffs2/yaffs_packedtags2.c
--- a/fs/yaffs2/yaffs_packedtags2.c 2010-10-03 17:48:22.722000365 +0300 +++ b/fs/yaffs2/yaffs_packedtags2.c
+++ b/fs/yaffs2/yaffs_packedtags2.c 2010-10-03 18:03:47.524000359 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -16987,9 +16952,8 @@ diff -Nrup a/fs/yaffs2/yaffs_packedtags2.c b/fs/yaffs2/yaffs_packedtags2.c
- -
} }
diff -Nrup a/fs/yaffs2/yaffs_packedtags2.h b/fs/yaffs2/yaffs_packedtags2.h --- a/fs/yaffs2/yaffs_packedtags2.h
--- a/fs/yaffs2/yaffs_packedtags2.h 2010-10-03 17:48:22.722000365 +0300 +++ b/fs/yaffs2/yaffs_packedtags2.h
+++ b/fs/yaffs2/yaffs_packedtags2.h 2010-10-03 18:03:47.547000363 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -17010,9 +16974,8 @@ diff -Nrup a/fs/yaffs2/yaffs_packedtags2.h b/fs/yaffs2/yaffs_packedtags2.h
/* Only the tags part (no ECC for use with inband tags */ /* Only the tags part (no ECC for use with inband tags */
void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *pt, const yaffs_ExtendedTags *t); void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *pt, const yaffs_ExtendedTags *t);
diff -Nrup a/fs/yaffs2/yaffs_qsort.h b/fs/yaffs2/yaffs_qsort.h --- a/fs/yaffs2/yaffs_qsort.h
--- a/fs/yaffs2/yaffs_qsort.h 2010-10-03 17:48:22.724000363 +0300 +++ b/fs/yaffs2/yaffs_qsort.h
+++ b/fs/yaffs2/yaffs_qsort.h 2010-10-03 18:03:47.548000359 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -17041,9 +17004,8 @@ diff -Nrup a/fs/yaffs2/yaffs_qsort.h b/fs/yaffs2/yaffs_qsort.h
#endif #endif
+#endif +#endif
diff -Nrup a/fs/yaffs2/yaffs_tagscompat.c b/fs/yaffs2/yaffs_tagscompat.c --- a/fs/yaffs2/yaffs_tagscompat.c
--- a/fs/yaffs2/yaffs_tagscompat.c 2010-10-03 17:48:22.724000363 +0300 +++ b/fs/yaffs2/yaffs_tagscompat.c
+++ b/fs/yaffs2/yaffs_tagscompat.c 2010-10-03 18:03:47.525000359 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -17171,9 +17133,8 @@ diff -Nrup a/fs/yaffs2/yaffs_tagscompat.c b/fs/yaffs2/yaffs_tagscompat.c
&spare1, &dummy, 1); &spare1, &dummy, 1);
if (yaffs_CountBits(spare0.blockStatus & spare1.blockStatus) < 7) if (yaffs_CountBits(spare0.blockStatus & spare1.blockStatus) < 7)
diff -Nrup a/fs/yaffs2/yaffs_tagscompat.h b/fs/yaffs2/yaffs_tagscompat.h --- a/fs/yaffs2/yaffs_tagscompat.h
--- a/fs/yaffs2/yaffs_tagscompat.h 2010-10-03 17:48:22.724000363 +0300 +++ b/fs/yaffs2/yaffs_tagscompat.h
+++ b/fs/yaffs2/yaffs_tagscompat.h 2010-10-03 18:03:47.548000359 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -17183,9 +17144,8 @@ diff -Nrup a/fs/yaffs2/yaffs_tagscompat.h b/fs/yaffs2/yaffs_tagscompat.h
* for Toby Churchill Ltd and Brightstar Engineering * for Toby Churchill Ltd and Brightstar Engineering
* *
* Created by Charles Manning <charles@aleph1.co.uk> * Created by Charles Manning <charles@aleph1.co.uk>
diff -Nrup a/fs/yaffs2/yaffs_tagsvalidity.c b/fs/yaffs2/yaffs_tagsvalidity.c --- a/fs/yaffs2/yaffs_tagsvalidity.c
--- a/fs/yaffs2/yaffs_tagsvalidity.c 2010-10-03 17:48:22.725000363 +0300 +++ b/fs/yaffs2/yaffs_tagsvalidity.c
+++ b/fs/yaffs2/yaffs_tagsvalidity.c 2010-10-03 18:03:47.526000362 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -17195,9 +17155,8 @@ diff -Nrup a/fs/yaffs2/yaffs_tagsvalidity.c b/fs/yaffs2/yaffs_tagsvalidity.c
* for Toby Churchill Ltd and Brightstar Engineering * for Toby Churchill Ltd and Brightstar Engineering
* *
* Created by Charles Manning <charles@aleph1.co.uk> * Created by Charles Manning <charles@aleph1.co.uk>
diff -Nrup a/fs/yaffs2/yaffs_tagsvalidity.h b/fs/yaffs2/yaffs_tagsvalidity.h --- a/fs/yaffs2/yaffs_tagsvalidity.h
--- a/fs/yaffs2/yaffs_tagsvalidity.h 2010-10-03 17:48:22.725000363 +0300 +++ b/fs/yaffs2/yaffs_tagsvalidity.h
+++ b/fs/yaffs2/yaffs_tagsvalidity.h 2010-10-03 18:03:47.549000359 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -17207,9 +17166,8 @@ diff -Nrup a/fs/yaffs2/yaffs_tagsvalidity.h b/fs/yaffs2/yaffs_tagsvalidity.h
* for Toby Churchill Ltd and Brightstar Engineering * for Toby Churchill Ltd and Brightstar Engineering
* *
* Created by Charles Manning <charles@aleph1.co.uk> * Created by Charles Manning <charles@aleph1.co.uk>
diff -Nrup a/fs/yaffs2/yaffs_trace.h b/fs/yaffs2/yaffs_trace.h --- /dev/null
--- a/fs/yaffs2/yaffs_trace.h 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_trace.h
+++ b/fs/yaffs2/yaffs_trace.h 2010-10-03 18:03:47.550000362 +0300
@@ -0,0 +1,60 @@ @@ -0,0 +1,60 @@
+/* +/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -17271,9 +17229,8 @@ diff -Nrup a/fs/yaffs2/yaffs_trace.h b/fs/yaffs2/yaffs_trace.h
+#define T(mask, p) do { if ((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0) +#define T(mask, p) do { if ((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0)
+ +
+#endif +#endif
diff -Nrup a/fs/yaffs2/yaffs_verify.c b/fs/yaffs2/yaffs_verify.c --- /dev/null
--- a/fs/yaffs2/yaffs_verify.c 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_verify.c
+++ b/fs/yaffs2/yaffs_verify.c 2010-10-03 18:03:47.527000365 +0300
@@ -0,0 +1,626 @@ @@ -0,0 +1,626 @@
+/* +/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -17901,9 +17858,8 @@ diff -Nrup a/fs/yaffs2/yaffs_verify.c b/fs/yaffs2/yaffs_verify.c
+ return YAFFS_OK; + return YAFFS_OK;
+#endif +#endif
+} +}
diff -Nrup a/fs/yaffs2/yaffs_verify.h b/fs/yaffs2/yaffs_verify.h --- /dev/null
--- a/fs/yaffs2/yaffs_verify.h 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_verify.h
+++ b/fs/yaffs2/yaffs_verify.h 2010-10-03 18:03:47.551000365 +0300
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
+/* +/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -17944,9 +17900,8 @@ diff -Nrup a/fs/yaffs2/yaffs_verify.h b/fs/yaffs2/yaffs_verify.h
+ +
+#endif +#endif
+ +
diff -Nrup a/fs/yaffs2/yaffs_vfs_glue.c b/fs/yaffs2/yaffs_vfs_glue.c --- /dev/null
--- a/fs/yaffs2/yaffs_vfs_glue.c 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_vfs_glue.c
+++ b/fs/yaffs2/yaffs_vfs_glue.c 2010-10-03 18:03:47.557000359 +0300
@@ -0,0 +1,3577 @@ @@ -0,0 +1,3577 @@
+/* +/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -21525,9 +21480,8 @@ diff -Nrup a/fs/yaffs2/yaffs_vfs_glue.c b/fs/yaffs2/yaffs_vfs_glue.c
+MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system"); +MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system");
+MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2010"); +MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2010");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
diff -Nrup a/fs/yaffs2/yaffs_yaffs1.c b/fs/yaffs2/yaffs_yaffs1.c --- /dev/null
--- a/fs/yaffs2/yaffs_yaffs1.c 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_yaffs1.c
+++ b/fs/yaffs2/yaffs_yaffs1.c 2010-10-03 18:03:47.535000365 +0300
@@ -0,0 +1,465 @@ @@ -0,0 +1,465 @@
+/* +/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -21994,9 +21948,8 @@ diff -Nrup a/fs/yaffs2/yaffs_yaffs1.c b/fs/yaffs2/yaffs_yaffs1.c
+ return YAFFS_OK; + return YAFFS_OK;
+} +}
+ +
diff -Nrup a/fs/yaffs2/yaffs_yaffs1.h b/fs/yaffs2/yaffs_yaffs1.h --- /dev/null
--- a/fs/yaffs2/yaffs_yaffs1.h 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_yaffs1.h
+++ b/fs/yaffs2/yaffs_yaffs1.h 2010-10-03 18:03:47.551000365 +0300
@@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
+/* +/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
@ -22020,9 +21973,8 @@ diff -Nrup a/fs/yaffs2/yaffs_yaffs1.h b/fs/yaffs2/yaffs_yaffs1.h
+int yaffs1_Scan(yaffs_Device *dev); +int yaffs1_Scan(yaffs_Device *dev);
+ +
+#endif +#endif
diff -Nrup a/fs/yaffs2/yaffs_yaffs2.c b/fs/yaffs2/yaffs_yaffs2.c --- /dev/null
--- a/fs/yaffs2/yaffs_yaffs2.c 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_yaffs2.c
+++ b/fs/yaffs2/yaffs_yaffs2.c 2010-10-03 18:03:47.536000367 +0300
@@ -0,0 +1,1540 @@ @@ -0,0 +1,1540 @@
+/* +/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -23564,9 +23516,8 @@ diff -Nrup a/fs/yaffs2/yaffs_yaffs2.c b/fs/yaffs2/yaffs_yaffs2.c
+ +
+ return YAFFS_OK; + return YAFFS_OK;
+} +}
diff -Nrup a/fs/yaffs2/yaffs_yaffs2.h b/fs/yaffs2/yaffs_yaffs2.h --- /dev/null
--- a/fs/yaffs2/yaffs_yaffs2.h 1970-01-01 02:00:00.000000000 +0200 +++ b/fs/yaffs2/yaffs_yaffs2.h
+++ b/fs/yaffs2/yaffs_yaffs2.h 2010-10-03 18:03:47.552000367 +0300
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+/* +/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@ -23604,9 +23555,8 @@ diff -Nrup a/fs/yaffs2/yaffs_yaffs2.h b/fs/yaffs2/yaffs_yaffs2.h
+int yaffs2_ScanBackwards(yaffs_Device *dev); +int yaffs2_ScanBackwards(yaffs_Device *dev);
+ +
+#endif +#endif
diff -Nrup a/fs/yaffs2/yportenv.h b/fs/yaffs2/yportenv.h --- a/fs/yaffs2/yportenv.h
--- a/fs/yaffs2/yportenv.h 2010-10-03 17:48:22.725000364 +0300 +++ b/fs/yaffs2/yportenv.h
+++ b/fs/yaffs2/yportenv.h 2010-10-03 18:03:47.555000363 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* /*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system. * YAFFS: Yet another Flash File System . A NAND-flash specific file system.

8
target/linux/generic/patches-2.6.36/600-phy_extension.patch
View File

@ -51,7 +51,7 @@
/** /**
* phy_mii_ioctl - generic PHY MII ioctl interface * phy_mii_ioctl - generic PHY MII ioctl interface
* @phydev: the phy_device struct * @phydev: the phy_device struct
@@ -351,7 +395,7 @@ int phy_mii_ioctl(struct phy_device *phy @@ -352,7 +396,7 @@ int phy_mii_ioctl(struct phy_device *phy
} }
phy_write(phydev, mii_data->reg_num, val); phy_write(phydev, mii_data->reg_num, val);
@ -60,7 +60,7 @@
if (mii_data->reg_num == MII_BMCR && if (mii_data->reg_num == MII_BMCR &&
val & BMCR_RESET && val & BMCR_RESET &&
phydev->drv->config_init) { phydev->drv->config_init) {
@@ -465,7 +509,7 @@ static void phy_force_reduction(struct p @@ -471,7 +515,7 @@ static void phy_force_reduction(struct p
int idx; int idx;
idx = phy_find_setting(phydev->speed, phydev->duplex); idx = phy_find_setting(phydev->speed, phydev->duplex);
@ -71,11 +71,11 @@
idx = phy_find_valid(idx, phydev->supported); idx = phy_find_valid(idx, phydev->supported);
--- a/include/linux/phy.h --- a/include/linux/phy.h
+++ b/include/linux/phy.h +++ b/include/linux/phy.h
@@ -497,6 +497,7 @@ void phy_start_machine(struct phy_device @@ -519,6 +519,7 @@ void phy_start_machine(struct phy_device
void phy_stop_machine(struct phy_device *phydev); void phy_stop_machine(struct phy_device *phydev);
int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd); int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd); int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr); +int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
int phy_mii_ioctl(struct phy_device *phydev, int phy_mii_ioctl(struct phy_device *phydev,
struct mii_ioctl_data *mii_data, int cmd); struct ifreq *ifr, int cmd);
int phy_start_interrupts(struct phy_device *phydev); int phy_start_interrupts(struct phy_device *phydev);

4
target/linux/generic/patches-2.6.36/601-phy-add-aneg-done-function.patch
View File

@ -1,6 +1,6 @@
--- a/include/linux/phy.h --- a/include/linux/phy.h
+++ b/include/linux/phy.h +++ b/include/linux/phy.h
@@ -384,9 +384,18 @@ struct phy_driver { @@ -386,9 +386,18 @@ struct phy_driver {
*/ */
int (*config_aneg)(struct phy_device *phydev); int (*config_aneg)(struct phy_device *phydev);
@ -21,7 +21,7 @@
--- a/drivers/net/phy/phy_device.c --- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c
@@ -710,6 +710,9 @@ int genphy_update_link(struct phy_device @@ -714,6 +714,9 @@ int genphy_update_link(struct phy_device
{ {
int status; int status;

4
target/linux/generic/patches-2.6.36/630-phy_packets.patch
View File

@ -30,7 +30,7 @@
INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine); INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
--- a/include/linux/phy.h --- a/include/linux/phy.h
+++ b/include/linux/phy.h +++ b/include/linux/phy.h
@@ -330,6 +330,20 @@ struct phy_device { @@ -332,6 +332,20 @@ struct phy_device {
void (*adjust_link)(struct net_device *dev); void (*adjust_link)(struct net_device *dev);
void (*adjust_state)(struct net_device *dev); void (*adjust_state)(struct net_device *dev);
@ -53,7 +53,7 @@
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -932,6 +932,7 @@ struct net_device { @@ -949,6 +949,7 @@ struct net_device {
void *ax25_ptr; /* AX.25 specific data */ void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data, struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */ assign before registering */

4
target/linux/generic/patches-2.6.36/700-rtc7301.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/rtc/Kconfig --- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig
@@ -625,6 +625,15 @@ config RTC_DRV_NUC900 @@ -654,6 +654,15 @@ config RTC_DRV_NUC900
If you say yes here you get support for the RTC subsystem of the If you say yes here you get support for the RTC subsystem of the
NUC910/NUC920 used in embedded systems. NUC910/NUC920 used in embedded systems.
@ -18,7 +18,7 @@
config RTC_DRV_DAVINCI config RTC_DRV_DAVINCI
--- a/drivers/rtc/Makefile --- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile
@@ -76,6 +76,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01) += rtc-rp5c @@ -80,6 +80,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01) += rtc-rp5c
obj-$(CONFIG_RTC_DRV_RS5C313) += rtc-rs5c313.o obj-$(CONFIG_RTC_DRV_RS5C313) += rtc-rs5c313.o
obj-$(CONFIG_RTC_DRV_RS5C348) += rtc-rs5c348.o obj-$(CONFIG_RTC_DRV_RS5C348) += rtc-rs5c348.o
obj-$(CONFIG_RTC_DRV_RS5C372) += rtc-rs5c372.o obj-$(CONFIG_RTC_DRV_RS5C372) += rtc-rs5c372.o

2
target/linux/generic/patches-2.6.36/750-glamo-headers.patch
View File

@ -1,6 +1,6 @@
--- a/include/linux/fb.h --- a/include/linux/fb.h
+++ b/include/linux/fb.h +++ b/include/linux/fb.h
@@ -122,6 +122,7 @@ @@ -125,6 +125,7 @@
#define FB_ACCEL_TRIDENT_BLADE3D 52 /* Trident Blade3D */ #define FB_ACCEL_TRIDENT_BLADE3D 52 /* Trident Blade3D */
#define FB_ACCEL_TRIDENT_BLADEXP 53 /* Trident BladeXP */ #define FB_ACCEL_TRIDENT_BLADEXP 53 /* Trident BladeXP */
#define FB_ACCEL_CIRRUS_ALPINE 53 /* Cirrus Logic 543x/544x/5480 */ #define FB_ACCEL_CIRRUS_ALPINE 53 /* Cirrus Logic 543x/544x/5480 */

4
target/linux/generic/patches-2.6.36/801-usb_serial_endpoint_size.patch
View File

@ -8,7 +8,7 @@
static int debug; static int debug;
/* initially all NULL */ /* initially all NULL */
static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
@@ -912,7 +913,7 @@ int usb_serial_probe(struct usb_interfac @@ -901,7 +902,7 @@ int usb_serial_probe(struct usb_interfac
} }
buffer_size = serial->type->bulk_in_size; buffer_size = serial->type->bulk_in_size;
if (!buffer_size) if (!buffer_size)
@ -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);
@@ -1382,3 +1383,5 @@ MODULE_LICENSE("GPL"); @@ -1373,3 +1374,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.36/840-unable_to_open_console.patch
View File

@ -1,6 +1,6 @@
--- a/init/main.c --- a/init/main.c
+++ b/init/main.c +++ b/init/main.c
@@ -903,7 +903,7 @@ static int __init kernel_init(void * unu @@ -894,7 +894,7 @@ static int __init kernel_init(void * unu
/* Open the /dev/console on the rootfs, this should never fail */ /* Open the /dev/console on the rootfs, this should never fail */
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)

2
target/linux/generic/patches-2.6.36/902-darwin_scripts_include.patch
View File

@ -62,7 +62,7 @@
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0])) #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
--- a/scripts/kconfig/Makefile --- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile
@@ -144,6 +144,9 @@ check-lxdialog := $(srctree)/$(src)/lxd @@ -147,6 +147,9 @@ check-lxdialog := $(srctree)/$(src)/lxd
# we really need to do so. (Do not call gcc as part of make mrproper) # we really need to do so. (Do not call gcc as part of make mrproper)
HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))

4
target/linux/generic/patches-2.6.36/903-hostap_txpower.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/hostap/hostap_ap.c --- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -2336,13 +2336,13 @@ int prism2_ap_get_sta_qual(local_info_t @@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t
addr[count].sa_family = ARPHRD_ETHER; addr[count].sa_family = ARPHRD_ETHER;
memcpy(addr[count].sa_data, sta->addr, ETH_ALEN); memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
if (sta->last_rx_silence == 0) if (sta->last_rx_silence == 0)
@ -20,7 +20,7 @@
qual[count].updated = sta->last_rx_updated; qual[count].updated = sta->last_rx_updated;
sta->last_rx_updated = IW_QUAL_DBM; sta->last_rx_updated = IW_QUAL_DBM;
@@ -2408,13 +2408,13 @@ int prism2_ap_translate_scan(struct net_ @@ -2407,13 +2407,13 @@ int prism2_ap_translate_scan(struct net_
memset(&iwe, 0, sizeof(iwe)); memset(&iwe, 0, sizeof(iwe));
iwe.cmd = IWEVQUAL; iwe.cmd = IWEVQUAL;
if (sta->last_rx_silence == 0) if (sta->last_rx_silence == 0)

12
target/linux/generic/patches-2.6.36/922-gpiommc.patch
View File

@ -611,7 +611,7 @@
+module_exit(gpiommc_modexit); +module_exit(gpiommc_modexit);
--- a/drivers/mmc/host/Kconfig --- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig
@@ -382,6 +382,31 @@ config MMC_TMIO @@ -392,6 +392,31 @@ config MMC_TMIO
This provides support for the SD/MMC cell found in TC6393XB, This provides support for the SD/MMC cell found in TC6393XB,
T7L66XB and also HTC ASIC3 T7L66XB and also HTC ASIC3
@ -645,14 +645,14 @@
depends on PCI depends on PCI
--- a/drivers/mmc/host/Makefile --- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_ @@ -33,6 +33,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_
obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o
obj-$(CONFIG_MMC_CB710) += cb710-mmc.o obj-$(CONFIG_MMC_CB710) += cb710-mmc.o
obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o
+obj-$(CONFIG_GPIOMMC) += gpiommc.o +obj-$(CONFIG_GPIOMMC) += gpiommc.o
obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o
obj-$(CONFIG_MMC_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_MMC_SH_MMCIF) += sh_mmcif.o
obj-$(CONFIG_MMC_JZ4740) += jz4740_mmc.o
--- /dev/null --- /dev/null
+++ b/include/linux/mmc/gpiommc.h +++ b/include/linux/mmc/gpiommc.h
@@ -0,0 +1,71 @@ @@ -0,0 +1,71 @@
@ -829,7 +829,7 @@
+be done automatically. +be done automatically.
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -2591,6 +2591,11 @@ T: git git://git.kernel.org/pub/scm/linu @@ -2662,6 +2662,11 @@ T: git git://git.kernel.org/pub/scm/linu
S: Maintained S: Maintained
F: drivers/media/video/gspca/ F: drivers/media/video/gspca/
@ -839,5 +839,5 @@
+S: Maintained +S: Maintained
+ +
HARDWARE MONITORING HARDWARE MONITORING
L: lm-sensors@lm-sensors.org M: Jean Delvare <khali@linux-fr.org>
W: http://www.lm-sensors.org/ M: Guenter Roeck <guenter.roeck@ericsson.com>

4
target/linux/generic/patches-2.6.36/930-crashlog.patch
View File

@ -15,7 +15,7 @@
+#endif +#endif
--- a/init/Kconfig --- a/init/Kconfig
+++ b/init/Kconfig +++ b/init/Kconfig
@@ -749,6 +749,10 @@ config NET_NS @@ -753,6 +753,10 @@ config NET_NS
Allow user space to create what appear to be multiple instances Allow user space to create what appear to be multiple instances
of the network stack. of the network stack.
@ -28,7 +28,7 @@
depends on BROKEN || !FRV depends on BROKEN || !FRV
--- a/kernel/Makefile --- a/kernel/Makefile
+++ b/kernel/Makefile +++ b/kernel/Makefile
@@ -105,6 +105,7 @@ obj-$(CONFIG_PERF_EVENTS) += perf_event. @@ -104,6 +104,7 @@ obj-$(CONFIG_PERF_EVENTS) += perf_event.
obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
obj-$(CONFIG_USER_RETURN_NOTIFIER) += user-return-notifier.o obj-$(CONFIG_USER_RETURN_NOTIFIER) += user-return-notifier.o
obj-$(CONFIG_PADATA) += padata.o obj-$(CONFIG_PADATA) += padata.o

2
target/linux/generic/patches-2.6.36/940-wireless_mesh_header.patch
View File

@ -1,6 +1,6 @@
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -139,7 +139,7 @@ static inline bool dev_xmit_complete(int @@ -145,7 +145,7 @@ static inline bool dev_xmit_complete(int
*/ */
#if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) #if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)

2
target/linux/generic/patches-2.6.36/970-ocf_kbuild_integration.patch
View File

@ -1,6 +1,6 @@
--- a/crypto/Kconfig --- a/crypto/Kconfig
+++ b/crypto/Kconfig +++ b/crypto/Kconfig
@@ -844,3 +844,6 @@ config CRYPTO_ANSI_CPRNG @@ -849,3 +849,6 @@ config CRYPTO_ANSI_CPRNG
source "drivers/crypto/Kconfig" source "drivers/crypto/Kconfig"
endif # if CRYPTO endif # if CRYPTO

2
target/linux/generic/patches-2.6.36/971-ocf_20100325.patch
View File

@ -160,7 +160,7 @@
--- a/kernel/pid.c --- a/kernel/pid.c
+++ b/kernel/pid.c +++ b/kernel/pid.c
@@ -389,6 +389,7 @@ struct task_struct *find_task_by_vpid(pi @@ -423,6 +423,7 @@ struct task_struct *find_task_by_vpid(pi
{ {
return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns); return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
} }

2
target/linux/generic/patches-2.6.36/977-textsearch_kconfig_hacks.patch
View File

@ -1,6 +1,6 @@
--- a/lib/Kconfig --- a/lib/Kconfig
+++ b/lib/Kconfig +++ b/lib/Kconfig
@@ -158,16 +158,16 @@ config REED_SOLOMON_DEC16 @@ -161,16 +161,16 @@ config REED_SOLOMON_DEC16
# Textsearch support is select'ed if needed # Textsearch support is select'ed if needed
# #
config TEXTSEARCH config TEXTSEARCH

22
target/linux/generic/patches-2.6.36/980-vm_exports.patch
View File

@ -1,14 +1,14 @@
--- a/mm/shmem.c --- a/mm/shmem.c
+++ b/mm/shmem.c +++ b/mm/shmem.c
@@ -29,6 +29,7 @@ @@ -30,6 +30,7 @@
#include <linux/mm.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/percpu_counter.h>
#include <linux/swap.h> #include <linux/swap.h>
+#include <linux/ima.h> +#include <linux/ima.h>
static struct vfsmount *shm_mnt; static struct vfsmount *shm_mnt;
@@ -2675,6 +2676,16 @@ out: @@ -2702,6 +2703,16 @@ out:
/* common code */ /* common code */
@ -25,7 +25,7 @@
/** /**
* shmem_file_setup - get an unlinked file living in tmpfs * shmem_file_setup - get an unlinked file living in tmpfs
* @name: name for dentry (to be seen in /proc/<pid>/maps * @name: name for dentry (to be seen in /proc/<pid>/maps
@@ -2752,9 +2763,6 @@ int shmem_zero_setup(struct vm_area_stru @@ -2779,9 +2790,6 @@ int shmem_zero_setup(struct vm_area_stru
if (IS_ERR(file)) if (IS_ERR(file))
return PTR_ERR(file); return PTR_ERR(file);
@ -38,7 +38,7 @@
} }
--- a/fs/file.c --- a/fs/file.c
+++ b/fs/file.c +++ b/fs/file.c
@@ -271,6 +271,7 @@ int expand_files(struct files_struct *fi @@ -264,6 +264,7 @@ int expand_files(struct files_struct *fi
/* All good, so we try */ /* All good, so we try */
return expand_fdtable(files, nr); return expand_fdtable(files, nr);
} }
@ -76,7 +76,7 @@
* macro override instead of weak attribute alias, to workaround * macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c --- a/kernel/sched.c
+++ b/kernel/sched.c +++ b/kernel/sched.c
@@ -4261,6 +4261,7 @@ int can_nice(const struct task_struct *p @@ -4446,6 +4446,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE)); capable(CAP_SYS_NICE));
} }
@ -86,7 +86,7 @@
--- a/mm/memory.c --- a/mm/memory.c
+++ b/mm/memory.c +++ b/mm/memory.c
@@ -1203,6 +1203,7 @@ unsigned long zap_page_range(struct vm_a @@ -1201,6 +1201,7 @@ unsigned long zap_page_range(struct vm_a
tlb_finish_mmu(tlb, address, end); tlb_finish_mmu(tlb, address, end);
return end; return end;
} }
@ -94,7 +94,7 @@
/** /**
* zap_vma_ptes - remove ptes mapping the vma * zap_vma_ptes - remove ptes mapping the vma
@@ -2615,6 +2616,7 @@ int vmtruncate_range(struct inode *inode @@ -2612,6 +2613,7 @@ int vmtruncate_range(struct inode *inode
return 0; return 0;
} }
@ -104,7 +104,7 @@
* We enter with non-exclusive mmap_sem (to exclude vma changes, * We enter with non-exclusive mmap_sem (to exclude vma changes,
--- a/mm/vmalloc.c --- a/mm/vmalloc.c
+++ b/mm/vmalloc.c +++ b/mm/vmalloc.c
@@ -1173,6 +1173,7 @@ void unmap_kernel_range(unsigned long ad @@ -1177,6 +1177,7 @@ void unmap_kernel_range(unsigned long ad
vunmap_page_range(addr, end); vunmap_page_range(addr, end);
flush_tlb_kernel_range(addr, end); flush_tlb_kernel_range(addr, end);
} }
@ -112,7 +112,7 @@
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages) int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
{ {
@@ -1288,6 +1289,7 @@ struct vm_struct *get_vm_area(unsigned l @@ -1292,6 +1293,7 @@ struct vm_struct *get_vm_area(unsigned l
return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END, return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
-1, GFP_KERNEL, __builtin_return_address(0)); -1, GFP_KERNEL, __builtin_return_address(0));
} }
@ -122,7 +122,7 @@
void *caller) void *caller)
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/include/linux/mm.h +++ b/include/linux/mm.h
@@ -732,6 +732,7 @@ extern void show_free_areas(void); @@ -736,6 +736,7 @@ extern void show_free_areas(void);
int shmem_lock(struct file *file, int lock, struct user_struct *user); int shmem_lock(struct file *file, int lock, struct user_struct *user);
struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags); struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);

2
target/linux/generic/patches-2.6.36/999-use_preinit_as_init.patch
View File

@ -1,6 +1,6 @@
--- a/init/main.c --- a/init/main.c
+++ b/init/main.c +++ b/init/main.c
@@ -854,10 +854,7 @@ static noinline int init_post(void) @@ -848,10 +848,7 @@ static noinline int init_post(void)
printk(KERN_WARNING "Failed to execute %s. Attempting " printk(KERN_WARNING "Failed to execute %s. Attempting "
"defaults...\n", execute_command); "defaults...\n", execute_command);
} }