---

yaml --- r: 277165 b: refs/heads/master c: 4ff7b82 h: refs/heads/master i: 277163: 714e736 v: v3
git-mirror · Dec 8, 2011 · cff15d1 · cff15d1
1 parent 8228bac
commit cff15d1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c8c27e2b89b020fd33dd3f2b18405d3f027e6ac
+refs/heads/master: 4ff7b82f1e5fc65a7c9512b231b4ea533f28541a
diff --git a/trunk/include/linux/memblock.h b/trunk/include/linux/memblock.h
@@ -129,7 +129,13 @@ int memblock_is_region_memory(phys_addr_t base, phys_addr_t size);
 int memblock_is_reserved(phys_addr_t addr);
 int memblock_is_region_reserved(phys_addr_t base, phys_addr_t size);
 
-void memblock_dump_all(void);
+extern void __memblock_dump_all(void);
+
+static inline void memblock_dump_all(void)
+{
+	if (memblock_debug)
+		__memblock_dump_all();
+}
 
 /**
  * memblock_set_current_limit - Set the current allocation limit to allow

diff --git a/trunk/mm/memblock.c b/trunk/mm/memblock.c
@@ -898,11 +898,8 @@ static void __init_memblock memblock_dump(struct memblock_type *type, char *name
 	}
 }
 
-void __init_memblock memblock_dump_all(void)
+void __init_memblock __memblock_dump_all(void)
 {
-	if (!memblock_debug)
-		return;
-
 	pr_info("MEMBLOCK configuration:\n");
 	pr_info(" memory size = 0x%llx\n", (unsigned long long)memblock.memory_size);