From 9347e0b0ce6255f4abef462d373577e7c8362fc6 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Fri, 1 Feb 2008 17:49:42 +0100 Subject: [PATCH] x86: remove unneeded round_up Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar --- arch/x86/mm/numa_64.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 9f533deb9da..a920d09b919 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c @@ -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); void *ptr; - if (mem != -1L) { - mem = round_up(mem, align); + if (mem != -1L) return __va(mem); - } + ptr = __alloc_bootmem_nopanic(size, align, __pa(MAX_DMA_ADDRESS)); if (ptr == NULL) { printk(KERN_ERR "Cannot find %lu bytes in node %d\n", -- 2.41.1