From 4ef5b94744e34194d2b6dd09a32b345481add1d8 Mon Sep 17 00:00:00 2001 From: jogo 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. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28893 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- 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/generic') 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 5caf0aaff..24aad52ef 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 fd69e3ffa..c58577533 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 1d92ebeae..288336dd4 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 31eb71617..7e1fab106 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 788e1f359..0eeef62de 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 630cdd9a8..9b7c2dc0b 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 545081403..226118986 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 db736c3bc..ccbe83ea3 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 db736c3bc..ccbe83ea3 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