diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2014-03-07 11:27:00 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2014-03-07 11:27:00 +0000 |
commit | 2b43bb49dec4546cdca7e627b06e7682ae742591 (patch) | |
tree | 0d58c3ccdefbe53983cda5399612b4727f0ee81d /target/linux/generic/patches-3.14/502-yaffs-3.10-disable-proc-entry.patch | |
parent | 3be7023c9be4e1381699ce393638ad63565c9ac5 (diff) | |
download | upstream-2b43bb49dec4546cdca7e627b06e7682ae742591.tar.gz upstream-2b43bb49dec4546cdca7e627b06e7682ae742591.tar.bz2 upstream-2b43bb49dec4546cdca7e627b06e7682ae742591.zip |
add preliminary 3.14 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39789 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/502-yaffs-3.10-disable-proc-entry.patch')
-rw-r--r-- | target/linux/generic/patches-3.14/502-yaffs-3.10-disable-proc-entry.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.14/502-yaffs-3.10-disable-proc-entry.patch b/target/linux/generic/patches-3.14/502-yaffs-3.10-disable-proc-entry.patch new file mode 100644 index 0000000000..5b73d3898b --- /dev/null +++ b/target/linux/generic/patches-3.14/502-yaffs-3.10-disable-proc-entry.patch @@ -0,0 +1,44 @@ +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -3025,6 +3025,7 @@ static DECLARE_FSTYPE(yaffs2_fs_type, "y + #endif + + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) + static struct proc_dir_entry *my_proc_entry; + + static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev) +@@ -3398,6 +3399,7 @@ static int yaffs_proc_write(struct file + return yaffs_proc_debug_write(file, buf, count, data); + return yaffs_proc_write_trace_options(file, buf, count, data); + } ++#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) */ + + /* Stuff to handle installation of file systems */ + struct file_system_to_install { +@@ -3421,6 +3423,7 @@ static int __init init_yaffs_fs(void) + + mutex_init(&yaffs_context_lock); + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) + /* Install the proc_fs entries */ + my_proc_entry = create_proc_entry("yaffs", + S_IRUGO | S_IFREG, YPROC_ROOT); +@@ -3432,6 +3435,7 @@ static int __init init_yaffs_fs(void) + } else { + return -ENOMEM; + } ++#endif + + /* Now add the file system entries */ + +@@ -3468,7 +3472,9 @@ static void __exit exit_yaffs_fs(void) + yaffs_trace(YAFFS_TRACE_ALWAYS, + "yaffs built " __DATE__ " " __TIME__ " removing."); + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) + remove_proc_entry("yaffs", YPROC_ROOT); ++#endif + + fsinst = fs_to_install; + |