From 3b423585a5234179c70bba860e9cf750b94ca8f8 Mon Sep 17 00:00:00 2001
From: Stephen Boyd <sboyd@codeaurora.org>
Date: Thu, 24 May 2012 00:45:21 -0700
Subject: [PATCH] --- yaml --- r: 310858 b: refs/heads/master c:
 eab309494ae2b9e15f85520f00de3893162c2e43 h: refs/heads/master v: v3

---
 [refs]              |  2 +-
 trunk/mm/memblock.c | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3073d60ae2d4..b4c1c1d1832f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a173b1476d126674104c7c5c6cef0bcd824b001
+refs/heads/master: eab309494ae2b9e15f85520f00de3893162c2e43
diff --git a/trunk/mm/memblock.c b/trunk/mm/memblock.c
index 952123eba433..32a0a5e4d79d 100644
--- a/trunk/mm/memblock.c
+++ b/trunk/mm/memblock.c
@@ -867,6 +867,16 @@ int __init_memblock memblock_is_memory(phys_addr_t addr)
 	return memblock_search(&memblock.memory, addr) != -1;
 }
 
+/**
+ * memblock_is_region_memory - check if a region is a subset of memory
+ * @base: base of region to check
+ * @size: size of region to check
+ *
+ * Check if the region [@base, @base+@size) is a subset of a memory block.
+ *
+ * RETURNS:
+ * 0 if false, non-zero if true
+ */
 int __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size)
 {
 	int idx = memblock_search(&memblock.memory, base);
@@ -879,6 +889,16 @@ int __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size
 		 memblock.memory.regions[idx].size) >= end;
 }
 
+/**
+ * memblock_is_region_reserved - check if a region intersects reserved memory
+ * @base: base of region to check
+ * @size: size of region to check
+ *
+ * Check if the region [@base, @base+@size) intersects a reserved memory block.
+ *
+ * RETURNS:
+ * 0 if false, non-zero if true
+ */
 int __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t size)
 {
 	memblock_cap_size(base, &size);