X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b74489d910ba0c22c30fc3db6d9f1c316c7333a8..93b9f41b61873dd2e47ddb1446863ac8ca906c94:/target/linux/generic/patches-2.6.36/065-rootfs_split.patch?ds=sidebyside

diff --git a/target/linux/generic/patches-2.6.36/065-rootfs_split.patch b/target/linux/generic/patches-2.6.36/065-rootfs_split.patch
index fac77f59f..31eb71617 100644
--- a/target/linux/generic/patches-2.6.36/065-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.36/065-rootfs_split.patch
@@ -37,7 +37,7 @@
  
  /*
   * MTD methods which simply translate the effective address and pass through
-@@ -524,6 +526,150 @@ out_register:
+@@ -524,6 +526,152 @@ out_register:
  	return slave;
  }
  
@@ -92,10 +92,12 @@
 +{
 +	struct mtd_partition *dpart;
 +	struct mtd_part *slave = NULL;
++	struct mtd_part *spart;
 +	int split_offset = 0;
 +	int ret;
 +
-+	ret = split_squashfs(master, part->offset, &split_offset);
++	spart = PART(rpart);
++	ret = split_squashfs(master, spart->offset, &split_offset);
 +	if (ret)
 +		return ret;
 +
@@ -113,7 +115,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)
@@ -554,7 +556,7 @@
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/map.h>
-@@ -854,6 +855,13 @@ static int mtd_ioctl(struct file *file,
+@@ -854,6 +855,13 @@ static int mtd_ioctl(struct file *file, 
  		file->f_pos = 0;
  		break;
  	}
@@ -619,7 +621,7 @@
  #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
  #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
  #define MEMISLOCKED		_IOR('M', 23, struct erase_info_user)
-+#define MTDREFRESH		_IO('M', 23)
++#define MTDREFRESH		_IO('M', 24)
  
  /*
   * Obsolete legacy interface. Keep it in order not to break userspace