projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update linux 3.2 to 3.2.15
[openwrt.git]
/
target
/
linux
/
generic
/
patches-3.2
/
440-block2mtd_init.patch
diff --git
a/target/linux/generic/patches-3.2/440-block2mtd_init.patch
b/target/linux/generic/patches-3.2/440-block2mtd_init.patch
index
513fbca
..
babc7f0
100644
(file)
--- a/
target/linux/generic/patches-3.2/440-block2mtd_init.patch
+++ b/
target/linux/generic/patches-3.2/440-block2mtd_init.patch
@@
-40,8
+40,8
@@
+ dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
dev->mtd.erasesize = erase_size;
dev->mtd.writesize = 1;
+ dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
dev->mtd.erasesize = erase_size;
dev->mtd.writesize = 1;
- dev->mtd.
type = MTD_RAM
;
-@@ -29
4,14 +299
,17 @@ static struct block2mtd_dev *add_device(
+ dev->mtd.
writebufsize = PAGE_SIZE
;
+@@ -29
5,14 +300
,17 @@ static struct block2mtd_dev *add_device(
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
@@
-62,7
+62,7
@@
return dev;
devinit_err:
return dev;
devinit_err:
-@@ -37
4,9 +382
,9 @@ static char block2mtd_paramline[80 + 12]
+@@ -37
5,9 +383
,9 @@ static char block2mtd_paramline[80 + 12]
static int block2mtd_setup2(const char *val)
{
static int block2mtd_setup2(const char *val)
{
@@
-74,7
+74,7
@@
char *name;
size_t erase_size = PAGE_SIZE;
int i, ret;
char *name;
size_t erase_size = PAGE_SIZE;
int i, ret;
-@@ -38
7,7 +395
,7 @@ static int block2mtd_setup2(const char *
+@@ -38
8,7 +396
,7 @@ static int block2mtd_setup2(const char *
strcpy(str, val);
kill_final_newline(str);
strcpy(str, val);
kill_final_newline(str);
@@
-83,7
+83,7
@@
token[i] = strsep(&str, ",");
if (str)
token[i] = strsep(&str, ",");
if (str)
-@@ -40
6,8 +414
,10 @@ static int block2mtd_setup2(const char *
+@@ -40
7,8 +415
,10 @@ static int block2mtd_setup2(const char *
parse_err("illegal erase size");
}
}
parse_err("illegal erase size");
}
}
@@
-95,7
+95,7
@@
return 0;
}
return 0;
}
-@@ -44
1,7 +451
,7 @@ static int block2mtd_setup(const char *v
+@@ -44
2,7 +452
,7 @@ static int block2mtd_setup(const char *v
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);