Merge remote branch 'linus/master' into x86/bootmem

[sfrench/cifs-2.6.git] / kernel / resource.c

diff --git a/kernel/resource.c b/kernel/resource.c
index af96c1e4b54b11b27fe445b834e3106b5b76b472..03c897f7935e100276e41ed83e1e3af3f549bbd9 100644 (file)
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -297,6 +297,19 @@ int walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages,
 
 #endif
 
+static int __is_ram(unsigned long pfn, unsigned long nr_pages, void *arg)
+{
+       return 1;
+}
+/*
+ * This generic page_is_ram() returns true if specified address is
+ * registered as "System RAM" in iomem_resource list.
+ */
+int __weak page_is_ram(unsigned long pfn)
+{
+       return walk_system_ram_range(pfn, 1, NULL, __is_ram) == 1;
+}
+
 /*
  * Find empty slot in the resource tree given range and alignment.
  */