diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-08-15 17:16:03 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-08-15 17:16:03 +0000 |
| commit | b1bd85c40eb5d22253fcc09c441abb50308ecd40 (patch) | |
| tree | b780ccb906996723106a614a5913c94611857fb4 /target/linux/generic/patches-4.1/504-yaffs-3.16-new-fops.patch | |
| parent | 1c66ebcd2db1e85590b11e0abc750eef25363328 (diff) | |
| download | upstream-b1bd85c40eb5d22253fcc09c441abb50308ecd40.tar.gz upstream-b1bd85c40eb5d22253fcc09c441abb50308ecd40.tar.bz2 upstream-b1bd85c40eb5d22253fcc09c441abb50308ecd40.zip | |
kernel: yaffs2: update to version from 2015-06-02
In addition to the update this also fixes compile problems with kernel 4.1.
This closes #20323.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 46609
Diffstat (limited to 'target/linux/generic/patches-4.1/504-yaffs-3.16-new-fops.patch')
| -rw-r--r-- | target/linux/generic/patches-4.1/504-yaffs-3.16-new-fops.patch | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/target/linux/generic/patches-4.1/504-yaffs-3.16-new-fops.patch b/target/linux/generic/patches-4.1/504-yaffs-3.16-new-fops.patch index 11c6da0516..32b4fdfa39 100644 --- a/target/linux/generic/patches-4.1/504-yaffs-3.16-new-fops.patch +++ b/target/linux/generic/patches-4.1/504-yaffs-3.16-new-fops.patch @@ -1,15 +1,19 @@ --- a/fs/yaffs2/yaffs_vfs.c +++ b/fs/yaffs2/yaffs_vfs.c -@@ -774,7 +774,21 @@ static int yaffs_sync_object(struct file +@@ -774,7 +774,25 @@ static int yaffs_sync_object(struct file } -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)) +static const struct file_operations yaffs_file_operations = { ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)) + .read = new_sync_read, ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) */ + .read_iter = generic_file_read_iter, ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)) + .write = new_sync_write, ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) */ + .write_iter = generic_file_write_iter, + .mmap = generic_file_mmap, + .flush = yaffs_file_flush, |