aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2011-07-06 12:55:21 +0000
committerImre Kaloz <kaloz@openwrt.org>2011-07-06 12:55:21 +0000
commit90bd74dd8b87d84697efbd3c2624c58496783dad (patch)
treef3d7e3f4ddf9d27b5c462dfbaed9de66214ad814 /target
parentf24764a37211d2068889186d7c5e08978ef13dc3 (diff)
downloadupstream-90bd74dd8b87d84697efbd3c2624c58496783dad.tar.gz
upstream-90bd74dd8b87d84697efbd3c2624c58496783dad.tar.bz2
upstream-90bd74dd8b87d84697efbd3c2624c58496783dad.zip
fixup mtd refresh and co.
SVN-Revision: 27491
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/patches-2.6.36/065-rootfs_split.patch2
-rw-r--r--target/linux/generic/patches-2.6.37/400-rootfs_split.patch10
-rw-r--r--target/linux/generic/patches-2.6.38/400-rootfs_split.patch10
-rw-r--r--target/linux/generic/patches-2.6.39/400-rootfs_split.patch10
-rw-r--r--target/linux/generic/patches-3.0/400-rootfs_split.patch21
5 files changed, 32 insertions, 21 deletions
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 3e1120ecd1..31eb71617b 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
@@ -621,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
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 d7003a9248..788e1f3594 100644
--- a/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
@@ -259,10 +259,10 @@
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
-@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file,
- file->f_pos = 0;
+@@ -956,6 +956,13 @@ static int mtd_ioctl(struct file *file,
break;
}
+ #endif
+#ifdef CONFIG_MTD_PARTITIONS
+ case MTDREFRESH:
+ {
@@ -271,8 +271,8 @@
+ }
+#endif
- case OTPGETREGIONCOUNT:
- case OTPGETREGIONINFO:
+ default:
+ ret = -ENOTTY;
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -125,6 +125,7 @@ struct nand_ecclayout {
@@ -325,7 +325,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
diff --git a/target/linux/generic/patches-2.6.38/400-rootfs_split.patch b/target/linux/generic/patches-2.6.38/400-rootfs_split.patch
index cabaab4b2b..630cdd9a8a 100644
--- a/target/linux/generic/patches-2.6.38/400-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.38/400-rootfs_split.patch
@@ -260,10 +260,10 @@
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
-@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file,
- file->f_pos = 0;
+@@ -956,6 +956,13 @@ static int mtd_ioctl(struct file *file,
break;
}
+ #endif
+#ifdef CONFIG_MTD_PARTITIONS
+ case MTDREFRESH:
+ {
@@ -272,8 +272,8 @@
+ }
+#endif
- case OTPGETREGIONCOUNT:
- case OTPGETREGIONINFO:
+ default:
+ ret = -ENOTTY;
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -125,6 +125,7 @@ struct nand_ecclayout {
@@ -326,7 +326,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
diff --git a/target/linux/generic/patches-2.6.39/400-rootfs_split.patch b/target/linux/generic/patches-2.6.39/400-rootfs_split.patch
index b9f345daa0..545081403d 100644
--- a/target/linux/generic/patches-2.6.39/400-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.39/400-rootfs_split.patch
@@ -260,10 +260,10 @@
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
-@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file,
- file->f_pos = 0;
+@@ -956,6 +956,13 @@ static int mtd_ioctl(struct file *file,
break;
}
+ #endif
+#ifdef CONFIG_MTD_PARTITIONS
+ case MTDREFRESH:
+ {
@@ -272,8 +272,8 @@
+ }
+#endif
- case OTPGETREGIONCOUNT:
- case OTPGETREGIONINFO:
+ default:
+ ret = -ENOTTY;
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -125,6 +125,7 @@ struct nand_ecclayout {
@@ -325,7 +325,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
diff --git a/target/linux/generic/patches-3.0/400-rootfs_split.patch b/target/linux/generic/patches-3.0/400-rootfs_split.patch
index d623bfd88a..db736c3bc5 100644
--- a/target/linux/generic/patches-3.0/400-rootfs_split.patch
+++ b/target/linux/generic/patches-3.0/400-rootfs_split.patch
@@ -257,18 +257,19 @@
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
-@@ -834,6 +834,11 @@ static int mtd_ioctl(struct file *file,
- file->f_pos = 0;
+@@ -948,6 +948,12 @@ static int mtd_ioctl(struct file *file,
break;
}
+
+ case MTDREFRESH:
+ {
+ ret = mtd_device_refresh(mtd);
+ break;
+ }
-
- case OTPGETREGIONCOUNT:
- case OTPGETREGIONINFO:
++
+ default:
+ ret = -ENOTTY;
+ }
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -125,6 +125,7 @@ struct nand_ecclayout {
@@ -314,3 +315,13 @@
};
#define MTDPART_OFS_NXTBLK (-2)
+--- a/include/mtd/mtd-abi.h
++++ b/include/mtd/mtd-abi.h
+@@ -127,6 +127,7 @@ struct otp_info {
+ #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', 24)
+
+ /*
+ * Obsolete legacy interface. Keep it in order not to break userspace