---

yaml --- r: 277148 b: refs/heads/master c: 67e24bc h: refs/heads/master v: v3
git-mirror · Jul 14, 2011 · b275723 · b275723
1 parent bfe56ac
commit b275723
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 784656f9c680d334e7b4cdb6951c5c913e5a26bf
+refs/heads/master: 67e24bcb725cabd15ef577bf301275d03d6086d7
diff --git a/trunk/include/linux/memblock.h b/trunk/include/linux/memblock.h
@@ -152,8 +152,8 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo
 
 
 #ifdef ARCH_DISCARD_MEMBLOCK
-#define __init_memblock __init
-#define __initdata_memblock __initdata
+#define __init_memblock __meminit
+#define __initdata_memblock __meminitdata
 #else
 #define __init_memblock
 #define __initdata_memblock