diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-03-08 22:07:30 +0300 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-03-08 22:07:30 +0300 |
commit | c6380ecd8e9bee7aba3d9a5a94b58168244c4a61 (patch) | |
tree | f8d9522c66e805f638399e094f8e0dfd92584d06 /fs/proc/array.c | |
parent | cdc2466df40f26af60f6b18123069bd52336a80c (diff) | |
parent | 661e50bc853209e41a5c14a290ca4decc43cbfd1 (diff) | |
download | linux-c6380ecd8e9bee7aba3d9a5a94b58168244c4a61.tar.xz |
Merge tag 'v4.16-rc4' into next
Sync up with mainline to bring in RAVE MFD device core.
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r-- | fs/proc/array.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index d67a72dcb92c..598803576e4c 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -736,16 +736,10 @@ static int children_seq_open(struct inode *inode, struct file *file) return ret; } -int children_seq_release(struct inode *inode, struct file *file) -{ - seq_release(inode, file); - return 0; -} - const struct file_operations proc_tid_children_operations = { .open = children_seq_open, .read = seq_read, .llseek = seq_lseek, - .release = children_seq_release, + .release = seq_release, }; #endif /* CONFIG_PROC_CHILDREN */ |