projects / openwrt / staging / blocktrron.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f24764a)
fixup mtd refresh and co.
authorImre Kaloz <kaloz@openwrt.org>
Wed, 6 Jul 2011 12:55:21 +0000 (12:55 +0000)
committerImre Kaloz <kaloz@openwrt.org>
Wed, 6 Jul 2011 12:55:21 +0000 (12:55 +0000)
SVN-Revision: 27491

target/linux/generic/patches-2.6.36/065-rootfs_split.patch patch | blob | history
target/linux/generic/patches-2.6.37/400-rootfs_split.patch patch | blob | history
target/linux/generic/patches-2.6.38/400-rootfs_split.patch patch | blob | history
target/linux/generic/patches-2.6.39/400-rootfs_split.patch patch | blob | history
target/linux/generic/patches-3.0/400-rootfs_split.patch patch | blob | history

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 3e1120ecd1ef3fc0f4871e1bdafa2d21b12d9004..31eb71617bf1d6ada5c52e437047538d1229d499 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
@@ -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 d7003a924814582edbd5138fffc3424745ef1158..788e1f359403bf4fe665354e864d1fb228689ccb 100644 (file)
--- 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 cabaab4b2b23dccfbfc0ca80aab2cb8768655ae7..630cdd9a8acad02eefe743a377c4345af2ea9d2e 100644 (file)
--- 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 b9f345daa00cc25c16d64922d106f0884d7239ce..545081403dc076fb20ed47d35ccced306534572f 100644 (file)
--- 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 d623bfd88a173369654963263a64ccd0a989e581..db736c3bc55a38967d8f107f0e31241533d71fef 100644 (file)
--- 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
Staging tree of David Bauer