[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.27 / 001-squashfs.patch

diff --git a/target/linux/generic-2.6/patches-2.6.27/001-squashfs.patch b/target/linux/generic-2.6/patches-2.6.27/001-squashfs.patch
index 97ba763..b817691 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.27/001-squashfs.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/001-squashfs.patch
@@ -1,6 +1,6 @@
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
 --- a/fs/Kconfig
 +++ b/fs/Kconfig

-@@ -1348,6 +1348,71 @@
+@@ -1348,6 +1348,71 @@ config CRAMFS

  
          If unsure, say N.
  
  
          If unsure, say N.
  


@@ -74,7 +74,7 @@
        depends on BLOCK
 --- a/fs/Makefile
 +++ b/fs/Makefile
        depends on BLOCK
 --- a/fs/Makefile
 +++ b/fs/Makefile

-@@ -74,6 +74,7 @@
+@@ -74,6 +74,7 @@ obj-$(CONFIG_JBD)            += jbd/

  obj-$(CONFIG_JBD2)            += jbd2/
  obj-$(CONFIG_EXT2_FS)         += ext2/
  obj-$(CONFIG_CRAMFS)          += cramfs/
  obj-$(CONFIG_JBD2)            += jbd2/
  obj-$(CONFIG_EXT2_FS)         += ext2/
  obj-$(CONFIG_CRAMFS)          += cramfs/


@@ -4128,7 +4128,7 @@
  #include <linux/initrd.h>
  #include <linux/string.h>
  
  #include <linux/initrd.h>
  #include <linux/string.h>
  

-@@ -37,6 +38,7 @@
+@@ -37,6 +38,7 @@ static int __init crd_load(int in_fd, in

   * numbers could not be found.
   *
   * We currently check for the following magic numbers:
   * numbers could not be found.
   *
   * We currently check for the following magic numbers:


@@ -4136,7 +4136,7 @@
   *    minix
   *    ext2
   *    romfs
   *    minix
   *    ext2
   *    romfs

-@@ -51,6 +53,7 @@
+@@ -51,6 +53,7 @@ identify_ramdisk_image(int fd, int start

        struct ext2_super_block *ext2sb;
        struct romfs_super_block *romfsb;
        struct cramfs_super *cramfsb;
        struct ext2_super_block *ext2sb;
        struct romfs_super_block *romfsb;
        struct cramfs_super *cramfsb;


@@ -4144,7 +4144,7 @@
        int nblocks = -1;
        unsigned char *buf;
  
        int nblocks = -1;
        unsigned char *buf;
  

-@@ -62,6 +65,7 @@
+@@ -62,6 +65,7 @@ identify_ramdisk_image(int fd, int start

        ext2sb = (struct ext2_super_block *) buf;
        romfsb = (struct romfs_super_block *) buf;
        cramfsb = (struct cramfs_super *) buf;
        ext2sb = (struct ext2_super_block *) buf;
        romfsb = (struct romfs_super_block *) buf;
        cramfsb = (struct cramfs_super *) buf;


@@ -4152,7 +4152,7 @@
        memset(buf, 0xe5, size);
  
        /*
        memset(buf, 0xe5, size);
  
        /*

-@@ -99,6 +103,15 @@
+@@ -99,6 +103,15 @@ identify_ramdisk_image(int fd, int start

                goto done;
        }
  
                goto done;
        }