summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYinghai Lu <Yinghai.Lu@Sun.COM>2008-02-01 17:49:42 +0100
committerIngo Molnar <mingo@elte.hu>2008-02-01 17:49:42 +0100
commit9347e0b0ce6255f4abef462d373577e7c8362fc6 (patch)
tree4c5bd0ed68a87049dd228e5743496383bbaa3690
parent31f3dff6c536e33f97c8f5049e1dd0a392933265 (diff)
downloadlinux-3.10-9347e0b0ce6255f4abef462d373577e7c8362fc6.tar.gz
linux-3.10-9347e0b0ce6255f4abef462d373577e7c8362fc6.tar.bz2
linux-3.10-9347e0b0ce6255f4abef462d373577e7c8362fc6.zip
x86: remove unneeded round_up
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/mm/numa_64.c5
1 files 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",