From 4d2c85000139fd4233460aed38df73e97e34cd6e Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Wed, 25 Aug 2010 13:39:15 -0700
Subject: [PATCH] --- yaml --- r: 212723 b: refs/heads/master c:
 9dc5d569c133819c1ce069ebb1d771c62de32580 h: refs/heads/master i:   212721:
 87daed83fb387f8d6b7e5b33534f6d3c3e0b6c49   212719:
 f09aee978f0e9b08eab28ea36b7b2cd176b323a2 v: v3

---
 [refs]                                |  2 +-
 trunk/arch/x86/include/asm/memblock.h |  3 +++
 trunk/arch/x86/mm/memblock.c          | 22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a018aaa8b180..34b132cb6e8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27de794365786b4cdc3461ed4e23af2a33f40612
+refs/heads/master: 9dc5d569c133819c1ce069ebb1d771c62de32580
diff --git a/trunk/arch/x86/include/asm/memblock.h b/trunk/arch/x86/include/asm/memblock.h
index 69cf853e9319..e11ddf059fa1 100644
--- a/trunk/arch/x86/include/asm/memblock.h
+++ b/trunk/arch/x86/include/asm/memblock.h
@@ -6,4 +6,7 @@
 u64 memblock_x86_find_in_range_size(u64 start, u64 *sizep, u64 align);
 void memblock_x86_to_bootmem(u64 start, u64 end);
 
+void memblock_x86_reserve_range(u64 start, u64 end, char *name);
+void memblock_x86_free_range(u64 start, u64 end);
+
 #endif
diff --git a/trunk/arch/x86/mm/memblock.c b/trunk/arch/x86/mm/memblock.c
index 8101084d452a..9829eaf1dbda 100644
--- a/trunk/arch/x86/mm/memblock.c
+++ b/trunk/arch/x86/mm/memblock.c
@@ -114,3 +114,25 @@ void __init memblock_x86_to_bootmem(u64 start, u64 end)
 	memblock_reserve_reserved_regions();
 }
 #endif
+
+void __init memblock_x86_reserve_range(u64 start, u64 end, char *name)
+{
+	if (start == end)
+		return;
+
+	if (WARN_ONCE(start > end, "memblock_x86_reserve_range: wrong range [%#llx, %#llx]\n", start, end))
+		return;
+
+	memblock_reserve(start, end - start);
+}
+
+void __init memblock_x86_free_range(u64 start, u64 end)
+{
+	if (start == end)
+		return;
+
+	if (WARN_ONCE(start > end, "memblock_x86_free_range: wrong range [%#llx, %#llx]\n", start, end))
+		return;
+
+	memblock_free(start, end - start);
+}