summaryrefslogtreecommitdiffstats
path: root/mm/memblock.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-08-04 06:17:17 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-08-04 06:17:17 +0200
commitf1c2c19c498e27de48bf0dc4221e6e31b1823169 (patch)
tree61c1b8b9ab32cd76128e33186148597a8b8b39b1 /mm/memblock.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw (diff)
downloadlinux-f1c2c19c498e27de48bf0dc4221e6e31b1823169.tar.xz
linux-f1c2c19c498e27de48bf0dc4221e6e31b1823169.zip
memblock: Fix memblock_is_region_reserved() to return a boolean
All callers expect a boolean result which is true if the region overlaps a reserved region. However, the implementation actually returns -1 if there is no overlap, and a region index (0 based) if there is. Make it behave as callers (and common sense) expect. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'mm/memblock.c')
-rw-r--r--mm/memblock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memblock.c b/mm/memblock.c
index 3024eb30fc27..43840b305ecb 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -504,7 +504,7 @@ int __init memblock_is_reserved(u64 addr)
int memblock_is_region_reserved(u64 base, u64 size)
{
- return memblock_overlaps_region(&memblock.reserved, base, size);
+ return memblock_overlaps_region(&memblock.reserved, base, size) >= 0;
}
/*