summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-09 21:02:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-09 21:02:42 -0700
commit1989425a3aed215f1accd5d8019b18b345166a63 (patch)
treeedf01f8cddce137588a501d74eedb43e98911c62 /mm
parent0fc2f137226eff4c9dd90864dda5c237474c3ec5 (diff)
parente32e78c5ee8aadef020fbaecbe6fb741ed9029fd (diff)
downloadop-kernel-dev-1989425a3aed215f1accd5d8019b18b345166a63.zip
op-kernel-dev-1989425a3aed215f1accd5d8019b18b345166a63.tar.gz
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: fix build with make 3.82 Revert "Input: appletouch - fix integer overflow issue" memblock: Fix memblock_is_region_reserved() to return a boolean powerpc: Trim defconfigs powerpc: fix i8042 module build error sound/soc: mpc5200_psc_ac97: Use gpio pins for cold reset powerpc/5200: add mpc5200_psc_ac97_gpio_reset
Diffstat (limited to 'mm')
-rw-r--r--mm/memblock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memblock.c b/mm/memblock.c
index 3024eb3..43840b3 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;
}
/*
OpenPOWER on IntegriCloud