diff options
author | Tejun Heo <tj@kernel.org> | 2011-07-12 03:58:09 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-07-13 19:36:01 -0400 |
commit | 1f5026a7e21e409c2b9dd54f6dfb9446511fb7c5 (patch) | |
tree | bcf0529d5f05ea8b685d6c0fddcb3197c2fab49c /mm/page_alloc.c | |
parent | 348968eb151e2569ad0ebe19b2f9c3c25b5c816a (diff) |
memblock: Kill MEMBLOCK_ERROR
25818f0f28 (memblock: Make MEMBLOCK_ERROR be 0) thankfully made
MEMBLOCK_ERROR 0 and there already are codes which expect error return
to be 0. There's no point in keeping MEMBLOCK_ERROR around. End its
misery.
Signed-off-by: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/1310457490-3356-6-git-send-email-tj@kernel.org
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index b6da6ed818a8..c7f0e5be4a31 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -3878,13 +3878,13 @@ u64 __init find_memory_core_early(int nid, u64 size, u64 align, | |||
3878 | 3878 | ||
3879 | addr = memblock_find_in_range(final_start, final_end, size, align); | 3879 | addr = memblock_find_in_range(final_start, final_end, size, align); |
3880 | 3880 | ||
3881 | if (addr == MEMBLOCK_ERROR) | 3881 | if (!addr) |
3882 | continue; | 3882 | continue; |
3883 | 3883 | ||
3884 | return addr; | 3884 | return addr; |
3885 | } | 3885 | } |
3886 | 3886 | ||
3887 | return MEMBLOCK_ERROR; | 3887 | return 0; |
3888 | } | 3888 | } |
3889 | #endif | 3889 | #endif |
3890 | 3890 | ||