Merge branch 'devel-stable' into devel

[firefly-linux-kernel-4.4.55.git] / arch / arm / mm / fault.c

diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index 556c8daf087dd0febf52a36ba004ec2e778944b5..cc8829d7e1161822d5a2694d1a008a4ca312a9d8 100644 (file)
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -17,6 +17,7 @@
 #include <linux/uaccess.h>
 #include <linux/page-flags.h>
 #include <linux/sched.h>
+#include <linux/highmem.h>
 
 #include <asm/system.h>
 #include <asm/pgtable.h>