From f53128f79b8fa5ec781c6c8957477b46c6198e8f Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 9 Nov 2011 21:16:36 +0000 Subject: target: linux: mtd: fix MTDREFRESH to an arbitrary high number To make the ioctl number "stable", use an arbitrary high number to prevent conflicts with new mtd ioctls that would push MTDREFRESH's number. Also make mtd use the in-kernel mtd headers. SVN-Revision: 28893 --- target/linux/generic/patches-2.6.30/065-rootfs_split.patch | 2 +- target/linux/generic/patches-2.6.31/065-rootfs_split.patch | 2 +- target/linux/generic/patches-2.6.32/065-rootfs_split.patch | 2 +- target/linux/generic/patches-2.6.36/065-rootfs_split.patch | 2 +- target/linux/generic/patches-2.6.37/400-rootfs_split.patch | 2 +- target/linux/generic/patches-2.6.38/400-rootfs_split.patch | 2 +- target/linux/generic/patches-2.6.39/400-rootfs_split.patch | 2 +- target/linux/generic/patches-3.0/400-rootfs_split.patch | 2 +- target/linux/generic/patches-3.1/400-rootfs_split.patch | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'target/linux') diff --git a/target/linux/generic/patches-2.6.30/065-rootfs_split.patch b/target/linux/generic/patches-2.6.30/065-rootfs_split.patch index 5caf0aaff7..24aad52ef8 100644 --- a/target/linux/generic/patches-2.6.30/065-rootfs_split.patch +++ b/target/linux/generic/patches-2.6.30/065-rootfs_split.patch @@ -629,7 +629,7 @@ #define ECCGETLAYOUT _IOR('M', 17, struct nand_ecclayout) #define ECCGETSTATS _IOR('M', 18, struct mtd_ecc_stats) #define MTDFILEMODE _IO('M', 19) -+#define MTDREFRESH _IO('M', 23) ++#define MTDREFRESH _IO('M', 50) /* * Obsolete legacy interface. Keep it in order not to break userspace diff --git a/target/linux/generic/patches-2.6.31/065-rootfs_split.patch b/target/linux/generic/patches-2.6.31/065-rootfs_split.patch index fd69e3ffaf..c585775332 100644 --- a/target/linux/generic/patches-2.6.31/065-rootfs_split.patch +++ b/target/linux/generic/patches-2.6.31/065-rootfs_split.patch @@ -621,7 +621,7 @@ #define MEMERASE64 _IOW('M', 20, struct erase_info_user64) #define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64) #define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64) -+#define MTDREFRESH _IO('M', 23) ++#define MTDREFRESH _IO('M', 50) /* * Obsolete legacy interface. Keep it in order not to break userspace diff --git a/target/linux/generic/patches-2.6.32/065-rootfs_split.patch b/target/linux/generic/patches-2.6.32/065-rootfs_split.patch index 1d92ebeae8..288336dd45 100644 --- a/target/linux/generic/patches-2.6.32/065-rootfs_split.patch +++ b/target/linux/generic/patches-2.6.32/065-rootfs_split.patch @@ -621,7 +621,7 @@ #define MEMERASE64 _IOW('M', 20, struct erase_info_user64) #define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64) #define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64) -+#define MTDREFRESH _IO('M', 23) ++#define MTDREFRESH _IO('M', 50) /* * Obsolete legacy interface. Keep it in order not to break userspace 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 31eb71617b..7e1fab106d 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', 24) ++#define MTDREFRESH _IO('M', 50) /* * 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 788e1f3594..0eeef62dea 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 @@ -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', 24) ++#define MTDREFRESH _IO('M', 50) /* * 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 630cdd9a8a..9b7c2dc0b7 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 @@ -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', 24) ++#define MTDREFRESH _IO('M', 50) /* * 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 545081403d..226118986f 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 @@ -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', 24) ++#define MTDREFRESH _IO('M', 50) /* * 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 db736c3bc5..ccbe83ea3c 100644 --- a/target/linux/generic/patches-3.0/400-rootfs_split.patch +++ b/target/linux/generic/patches-3.0/400-rootfs_split.patch @@ -321,7 +321,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', 24) ++#define MTDREFRESH _IO('M', 50) /* * Obsolete legacy interface. Keep it in order not to break userspace diff --git a/target/linux/generic/patches-3.1/400-rootfs_split.patch b/target/linux/generic/patches-3.1/400-rootfs_split.patch index db736c3bc5..ccbe83ea3c 100644 --- a/target/linux/generic/patches-3.1/400-rootfs_split.patch +++ b/target/linux/generic/patches-3.1/400-rootfs_split.patch @@ -321,7 +321,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', 24) ++#define MTDREFRESH _IO('M', 50) /* * Obsolete legacy interface. Keep it in order not to break userspace -- cgit v1.2.3