Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[firefly-linux-kernel-4.4.55.git] / mm / memcontrol.c

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index cf7d027a8844b115bcc6d213264707d220c6c3d9..ddffc74cdebe50f1d83a592a6d905ad0ff011f16 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -35,6 +35,7 @@
 #include <linux/limits.h>
 #include <linux/mutex.h>
 #include <linux/rbtree.h>
+#include <linux/shmem_fs.h>
 #include <linux/slab.h>
 #include <linux/swap.h>
 #include <linux/swapops.h>