diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-13 20:55:32 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-13 20:55:32 +0300 |
| commit | f788baadbdd95b0309ab8e1565d5c425e197b8db (patch) | |
| tree | b0bd79b85eff2ee7bd36f2ab304d63ab7401645b /mm/Makefile | |
| parent | c202baf017aea0c860e53131bc55bb1af7177e76 (diff) | |
| parent | 96b62a57193494010eed66ca0739c93eb4653162 (diff) | |
| download | linux-f788baadbdd95b0309ab8e1565d5c425e197b8db.tar.xz | |
Merge branch 'gadget' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull gadgetfs fixes from Al Viro:
"Assorted fixes around AIO on gadgetfs: leaks, use-after-free, troubles
caused by ->f_op flipping"
* 'gadget' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
gadgetfs: really get rid of switching ->f_op
gadgetfs: get rid of flipping ->f_op in ep_config()
gadget: switch ep_io_operations to ->read_iter/->write_iter
gadgetfs: use-after-free in ->aio_read()
gadget/function/f_fs.c: switch to ->{read,write}_iter()
gadget/function/f_fs.c: use put iov_iter into io_data
gadget/function/f_fs.c: close leaks
move iov_iter.c from mm/ to lib/
new helper: dup_iter()
Diffstat (limited to 'mm/Makefile')
| -rw-r--r-- | mm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/Makefile b/mm/Makefile index 3c1caa2693bd..15dbe9903c27 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -21,7 +21,7 @@ obj-y := filemap.o mempool.o oom_kill.o \ mm_init.o mmu_context.o percpu.o slab_common.o \ compaction.o vmacache.o \ interval_tree.o list_lru.o workingset.o \ - iov_iter.o debug.o $(mmu-y) + debug.o $(mmu-y) obj-y += init-mm.o |