From: Hauke Mehrtens <hauke@xxxxxxxxxx> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> --- backport/backport-include/linux/compat-3.4.h | 3 --- backport/backport-include/linux/fs.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 backport/backport-include/linux/fs.h diff --git a/backport/backport-include/linux/compat-3.4.h b/backport/backport-include/linux/compat-3.4.h index a152d51..6f655bd 100644 --- a/backport/backport-include/linux/compat-3.4.h +++ b/backport/backport-include/linux/compat-3.4.h @@ -102,9 +102,6 @@ static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags) extern const struct i2c_algorithm i2c_bit_algo; #endif -#define simple_open LINUX_BACKPORT(simple_open) -extern int simple_open(struct inode *inode, struct file *file); - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)) #define skb_add_rx_frag(skb, i, page, off, size, truesize) \ v2_6_28_skb_add_rx_frag(skb, i, page, off, size) diff --git a/backport/backport-include/linux/fs.h b/backport/backport-include/linux/fs.h new file mode 100644 index 0000000..db57d42 --- /dev/null +++ b/backport/backport-include/linux/fs.h @@ -0,0 +1,15 @@ +#ifndef _COMPAT_LINUX_FS_H +#define _COMPAT_LINUX_FS_H + +#include_next <linux/fs.h> + +#include <linux/version.h> + +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) + +#define simple_open LINUX_BACKPORT(simple_open) +extern int simple_open(struct inode *inode, struct file *file); + +#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) */ + +#endif /* _COMPAT_LINUX_FS_H */ -- 1.8.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
