move NULL check before use (bug#22)

This commit is contained in:
NAKAMURA Gou
2013-05-17 12:39:11 +09:00
parent 31b83e0b41
commit da97e6af6b

View File

@@ -46,15 +46,15 @@ void *__ihk_pagealloc_init(unsigned long start, unsigned long size,
} else { } else {
desc = (void *)allocate_pages(descsize, 0); desc = (void *)allocate_pages(descsize, 0);
} }
flag = descsize;
memset(desc, 0, descsize * PAGE_SIZE);
if (!desc) { if (!desc) {
kprintf("IHK: failed to allocate page-allocator-desc "\ kprintf("IHK: failed to allocate page-allocator-desc "\
"(%lx, %lx, %lx)\n", start, size, unit); "(%lx, %lx, %lx)\n", start, size, unit);
return NULL; return NULL;
} }
flag = descsize;
memset(desc, 0, descsize * PAGE_SIZE);
desc->start = start; desc->start = start;
desc->last = 0; desc->last = 0;
desc->count = mapaligned >> 3; desc->count = mapaligned >> 3;