projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update ssb and bcma to linux-next next-20110628
[openwrt.git]
/
target
/
linux
/
generic
/
patches-2.6.36
/
065-rootfs_split.patch
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
fac77f5
..
3e1120e
100644
(file)
--- 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
/*
* MTD methods which simply translate the effective address and pass through
-@@ -524,6 +526,15
0
@@ out_register:
+@@ -524,6 +526,15
2
@@ out_register:
return slave;
}
return slave;
}
@@
-92,10
+92,12
@@
+{
+ struct mtd_partition *dpart;
+ struct mtd_part *slave = NULL;
+{
+ struct mtd_partition *dpart;
+ struct mtd_part *slave = NULL;
++ struct mtd_part *spart;
+ int split_offset = 0;
+ int ret;
+
+ 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;
+
+ if (ret)
+ return ret;
+
@@
-113,7
+115,7
@@
+ dpart->name = (unsigned char *)&dpart[1];
+ strcpy(dpart->name, ROOTFS_SPLIT_NAME);
+
+ 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)
+ dpart->offset = split_offset;
+
+ if (dpart == NULL)
@@
-554,7
+556,7
@@
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#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;
}
file->f_pos = 0;
break;
}
This page took
0.021977 seconds
and
4
git commands to generate.