From de43651ae23d304522e22ce6075039760d8ea591 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Tue, 24 May 2011 17:13:19 -0700
Subject: [PATCH] --- yaml --- r: 250967 b: refs/heads/master c:
 95dde501907b06e7203c74f8435acfdab9eb2659 h: refs/heads/master i:   250965:
 8eae63fd485a2d2cc4e07d8d1eaf63bc42d33eef   250963:
 ac87bb3ed89bf150ef400d0f62cf6e780db1516d   250959:
 efc94925ae076b623f09c1983c49db64329c469f v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/memblock.h | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0029f92d3c58..75d3cf91f3ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9be9b90d6dc5e712ca5d6109691a8de753ce7f1
+refs/heads/master: 95dde501907b06e7203c74f8435acfdab9eb2659
diff --git a/trunk/include/linux/memblock.h b/trunk/include/linux/memblock.h
index 62a10c2a11f2..7525e38c434d 100644
--- a/trunk/include/linux/memblock.h
+++ b/trunk/include/linux/memblock.h
@@ -2,6 +2,8 @@
 #define _LINUX_MEMBLOCK_H
 #ifdef __KERNEL__
 
+#define MEMBLOCK_ERROR	0
+
 #ifdef CONFIG_HAVE_MEMBLOCK
 /*
  * Logical memory blocks.
@@ -20,7 +22,6 @@
 #include <asm/memblock.h>
 
 #define INIT_MEMBLOCK_REGIONS	128
-#define MEMBLOCK_ERROR		0
 
 struct memblock_region {
 	phys_addr_t base;
@@ -160,6 +161,12 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo
 #define __initdata_memblock
 #endif
 
+#else
+static inline phys_addr_t memblock_alloc(phys_addr_t size, phys_addr_t align)
+{
+	return MEMBLOCK_ERROR;
+}
+
 #endif /* CONFIG_HAVE_MEMBLOCK */
 
 #endif /* __KERNEL__ */