Commit 9347e0b0 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar

x86: remove unneeded round_up

Signed-off-by: default avatarYinghai Lu <yinghai.lu@sun.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 31f3dff6
...@@ -168,10 +168,9 @@ static void * __init early_node_mem(int nodeid, unsigned long start, ...@@ -168,10 +168,9 @@ static void * __init early_node_mem(int nodeid, unsigned long start,
unsigned long mem = find_e820_area(start, end, size, align); unsigned long mem = find_e820_area(start, end, size, align);
void *ptr; void *ptr;
if (mem != -1L) { if (mem != -1L)
mem = round_up(mem, align);
return __va(mem); return __va(mem);
}
ptr = __alloc_bootmem_nopanic(size, align, __pa(MAX_DMA_ADDRESS)); ptr = __alloc_bootmem_nopanic(size, align, __pa(MAX_DMA_ADDRESS));
if (ptr == NULL) { if (ptr == NULL) {
printk(KERN_ERR "Cannot find %lu bytes in node %d\n", printk(KERN_ERR "Cannot find %lu bytes in node %d\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment