diff options
Diffstat (limited to 'arch/x86/mm/memblock.c')
-rw-r--r-- | arch/x86/mm/memblock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/memblock.c b/arch/x86/mm/memblock.c index 992da5ec5a64..e126117d1b03 100644 --- a/arch/x86/mm/memblock.c +++ b/arch/x86/mm/memblock.c | |||
@@ -66,7 +66,7 @@ u64 __init memblock_x86_find_in_range_size(u64 start, u64 *sizep, u64 align) | |||
66 | return addr; | 66 | return addr; |
67 | } | 67 | } |
68 | 68 | ||
69 | return MEMBLOCK_ERROR; | 69 | return 0; |
70 | } | 70 | } |
71 | 71 | ||
72 | static __init struct range *find_range_array(int count) | 72 | static __init struct range *find_range_array(int count) |
@@ -78,7 +78,7 @@ static __init struct range *find_range_array(int count) | |||
78 | end = memblock.current_limit; | 78 | end = memblock.current_limit; |
79 | 79 | ||
80 | mem = memblock_find_in_range(0, end, size, sizeof(struct range)); | 80 | mem = memblock_find_in_range(0, end, size, sizeof(struct range)); |
81 | if (mem == MEMBLOCK_ERROR) | 81 | if (!mem) |
82 | panic("can not find more space for range array"); | 82 | panic("can not find more space for range array"); |
83 | 83 | ||
84 | /* | 84 | /* |
@@ -274,7 +274,7 @@ u64 __init memblock_x86_find_in_range_node(int nid, u64 start, u64 end, u64 size | |||
274 | { | 274 | { |
275 | u64 addr; | 275 | u64 addr; |
276 | addr = find_memory_core_early(nid, size, align, start, end); | 276 | addr = find_memory_core_early(nid, size, align, start, end); |
277 | if (addr != MEMBLOCK_ERROR) | 277 | if (addr) |
278 | return addr; | 278 | return addr; |
279 | 279 | ||
280 | /* Fallback, should already have start end within node range */ | 280 | /* Fallback, should already have start end within node range */ |