summaryrefslogtreecommitdiffstats
path: root/mm/rmap.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-27 19:22:23 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-27 19:22:23 +0100
commitd19f1d44e74322ae2a75dc07b7d44fecacd5bcfb (patch)
treeee8127be714d3ed59b31266aaaee2fb1d17a815a /mm/rmap.c
parentabb0b3d96a1f9407dd66831ae33985a386d4200d (diff)
parentd6d5df1db6e9d7f8f76d2911707f7d5877251b02 (diff)
downloadtalos-op-linux-d19f1d44e74322ae2a75dc07b7d44fecacd5bcfb.tar.gz
talos-op-linux-d19f1d44e74322ae2a75dc07b7d44fecacd5bcfb.zip
Merge 5.4-rc5 into usb-next
We want the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/rmap.c')
-rw-r--r--mm/rmap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/rmap.c b/mm/rmap.c
index d9a23bb773bf..0c7b2a9400d4 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -61,6 +61,7 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
#include <linux/hugetlb.h>
+#include <linux/huge_mm.h>
#include <linux/backing-dev.h>
#include <linux/page_idle.h>
#include <linux/memremap.h>
OpenPOWER on IntegriCloud