From c5a9834bb42c45e2bd0873fa409cb8e7ea7badf2 Mon Sep 17 00:00:00 2001 From: hcg Date: Thu, 28 May 2009 10:00:48 +0000 Subject: [kernel] revert 15922 - add back 2.6.29 kernel support git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16127 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../066-rootfs_split_squashfs4_fix.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 target/linux/generic-2.6/patches-2.6.29/066-rootfs_split_squashfs4_fix.patch (limited to 'target/linux/generic-2.6/patches-2.6.29/066-rootfs_split_squashfs4_fix.patch') diff --git a/target/linux/generic-2.6/patches-2.6.29/066-rootfs_split_squashfs4_fix.patch b/target/linux/generic-2.6/patches-2.6.29/066-rootfs_split_squashfs4_fix.patch new file mode 100644 index 000000000..f1766398c --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.29/066-rootfs_split_squashfs4_fix.patch @@ -0,0 +1,27 @@ +--- a/drivers/mtd/mtdpart.c ++++ b/drivers/mtd/mtdpart.c +@@ -515,21 +515,21 @@ static int split_squashfs(struct mtd_inf + return -EINVAL; + } + +- if (*((u32 *) buf) != SQUASHFS_MAGIC) { ++ if (SQUASHFS_MAGIC != le32_to_cpu(sb->s_magic) ) { + printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n", + master->name); + *split_offset = 0; + return 0; + } + +- if (sb->bytes_used <= 0) { ++ if (le64_to_cpu((sb->bytes_used)) <= 0) { + printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n", + master->name); + *split_offset = 0; + return 0; + } + +- len = (u32) sb->bytes_used; ++ len = (u32) le64_to_cpu(sb->bytes_used); + len += (offset & 0x000fffff); + len += (master->erasesize - 1); + len &= ~(master->erasesize - 1); -- cgit v1.2.3