---

yaml --- r: 212714 b: refs/heads/master c: 37d8d4b h: refs/heads/master v: v3
git-mirror · Aug 5, 2010 · d085340 · d085340
1 parent 481ba6d
commit d085340
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea9e4376bb545e400a325b3d76fecd02815303c0
+refs/heads/master: 37d8d4bf489e39eedc9537f8616fe87879b13cb0
diff --git a/trunk/include/linux/memblock.h b/trunk/include/linux/memblock.h
@@ -18,7 +18,8 @@
 
 #include <asm/memblock.h>
 
-#define INIT_MEMBLOCK_REGIONS 128
+#define INIT_MEMBLOCK_REGIONS	128
+#define MEMBLOCK_ERROR		(~(phys_addr_t)0)
 
 struct memblock_region {
 	phys_addr_t base;

diff --git a/trunk/mm/memblock.c b/trunk/mm/memblock.c
@@ -27,8 +27,6 @@ int memblock_can_resize;
 static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS + 1];
 static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS + 1];
 
-#define MEMBLOCK_ERROR	(~(phys_addr_t)0)
-
 /* inline so we don't get a warning when pr_debug is compiled out */
 static inline const char *memblock_type_name(struct memblock_type *type)
 {