[kernel] refresh 2.6.37 patches

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-2.6.37 / 400-rootfs_split.patch

diff --git a/target/linux/generic/patches-2.6.37/400-rootfs_split.patch b/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
index f5f95cfda14860454c95719e28f8954104f7502c..00210c09576bca33471793ed2b3d817cfe2c4bf5 100644 (file)
--- a/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
@@ -37,7 +37,7 @@
  
  /*
   * MTD methods which simply translate the effective address and pass through
-@@ -618,6 +620,153 @@ int mtd_del_partition(struct mtd_info *m
+@@ -618,6 +620,155 @@ int mtd_del_partition(struct mtd_info *m
  }
  EXPORT_SYMBOL_GPL(mtd_del_partition);
  
@@ -92,9 +92,11 @@
 +{
 +      struct mtd_partition *dpart;
 +      struct mtd_part *slave = NULL;
++      struct mtd_part *spart;
 +      int ret, split_offset = 0;
 +
-+      ret = split_squashfs(master, part->offset, &split_offset);
++      spart = PART(rpart);
++      ret = split_squashfs(master, spart->offset, &split_offset);
 +      if (ret)
 +              return ret;
 +
@@ -112,7 +114,7 @@
 +      dpart->name = (unsigned char *)&dpart[1];
 +      strcpy(dpart->name, ROOTFS_SPLIT_NAME);
 +
-+      dpart->size -= split_offset - dpart->offset;
++      dpart->size = rpart->size - (split_offset - spart->offset);
 +      dpart->offset = split_offset;
 +
 +      if (dpart == NULL)
@@ -191,7 +193,7 @@
  /*
   * This function, given a master MTD object and a partition table, creates
   * and registers slave MTD objects which are bound to the master according to
-@@ -633,7 +782,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -633,7 +784,7 @@ int add_mtd_partitions(struct mtd_info *
  {
        struct mtd_part *slave;
        uint64_t cur_offset = 0;
@@ -200,7 +202,7 @@
  
        printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
  
-@@ -648,6 +797,21 @@ int add_mtd_partitions(struct mtd_info *
+@@ -648,6 +799,21 @@ int add_mtd_partitions(struct mtd_info *
  
                add_mtd_device(&slave->mtd);
  
@@ -222,7 +224,7 @@
                cur_offset = slave->offset + slave->mtd.size;
        }
  
-@@ -655,6 +819,32 @@ int add_mtd_partitions(struct mtd_info *
+@@ -655,6 +821,32 @@ int add_mtd_partitions(struct mtd_info *
  }
  EXPORT_SYMBOL(add_mtd_partitions);
  
@@ -257,7 +259,7 @@
  
 --- a/drivers/mtd/mtdchar.c
 +++ b/drivers/mtd/mtdchar.c
-@@ -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;
                break;
        }