On 5/16/11 12:14 PM, Felix Fietkau wrote:
> I'm busy with other stuff, and you're almost done, so why give up now?
>
> - Felix
Ok, here it is reworked. I try to fix the warnings in the patches where they
are introduced.
Index: target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch
===================================================================
--- target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch
(revision 26907)
+++ target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch
(working copy)
@@ -1,10 +1,16 @@
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
-@@ -268,6 +268,7 @@ static int _open_bdev(struct block2mtd_d
+@@ -264,10 +264,12 @@ static int _open_bdev(struct block2mtd_d
+ bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
+ #ifndef MODULE
+ if (IS_ERR(bdev)) {
++ dev_t devt;
+
/* We might not have rootfs mounted at this point. Try
to resolve the device name by other means. */
+ wait_for_device_probe();
- dev_t devt = name_to_dev_t(dev->devname);
+- dev_t devt = name_to_dev_t(dev->devname);
++ devt = name_to_dev_t(dev->devname);
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
Index: target/linux/generic/patches-2.6.37/400-rootfs_split.patch
===================================================================
--- target/linux/generic/patches-2.6.37/400-rootfs_split.patch (revision 26907)
+++ target/linux/generic/patches-2.6.37/400-rootfs_split.patch (working copy)
@@ -111,8 +111,8 @@
+ }
+
+ memcpy(dpart, part, sizeof(*part));
++ strcpy((char *)&dpart[1], ROOTFS_SPLIT_NAME);
+ dpart->name = (unsigned char *)&dpart[1];
-+ strcpy(dpart->name, ROOTFS_SPLIT_NAME);
+
+ dpart->size = rpart->size - (split_offset - spart->offset);
+ dpart->offset = split_offset;
@@ -301,7 +301,8 @@
+struct mtd_partition;
struct mtd_partition {
- char *name; /* identifier string */
+- char *name; /* identifier string */
++ const char *name; /* identifier string */
uint64_t size; /* partition size */
uint64_t offset; /* offset within the master MTD space */
uint32_t mask_flags; /* master MTD flags to mask out for
this partition */
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
