Merge branch 'akpm' (patches from Andrew)

[firefly-linux-kernel-4.4.55.git] / include / linux / mm.h

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 11df1a8ea38bd81c0f428fb625e481dddb30482f..f25a957bf0ab68967cc57d5f7d9472831f65cad2 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -350,7 +350,14 @@ static inline int get_page_unless_zero(struct page *page)
 }
 
 extern int page_is_ram(unsigned long pfn);
-extern int region_is_ram(resource_size_t phys_addr, unsigned long size);
+
+enum {
+       REGION_INTERSECTS,
+       REGION_DISJOINT,
+       REGION_MIXED,
+};
+
+int region_intersects(resource_size_t offset, size_t size, const char *type);
 
 /* Support for virtually mapped pages */
 struct page *vmalloc_to_page(const void *addr);