Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / mm.h

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 3f1fafc0245e7eebf0ee45334d3c7c3ff77f4a89..c643016499a17860605566a77ea2c622f83f0ffe 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -3,6 +3,7 @@
 
 #include <linux/sched.h>
 #include <linux/errno.h>
+#include <linux/capability.h>
 
 #ifdef __KERNEL__
 
@@ -1027,7 +1028,7 @@ kernel_map_pages(struct page *page, int numpages, int enable)
 {
        if (!PageHighMem(page) && !enable)
                mutex_debug_check_no_locks_freed(page_address(page),
-                                                page_address(page + numpages));
+                                                numpages * PAGE_SIZE);
 }
 #endif