diff options
| author | Yinghai Lu <Yinghai.Lu@Sun.COM> | 2008-02-01 11:49:42 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-02-01 11:49:42 -0500 |
| commit | 9347e0b0ce6255f4abef462d373577e7c8362fc6 (patch) | |
| tree | 4c5bd0ed68a87049dd228e5743496383bbaa3690 /arch | |
| parent | 31f3dff6c536e33f97c8f5049e1dd0a392933265 (diff) | |
x86: remove unneeded round_up
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/mm/numa_64.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 9f533deb9dad..a920d09b9194 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, | |||
| 168 | unsigned long mem = find_e820_area(start, end, size, align); | 168 | unsigned long mem = find_e820_area(start, end, size, align); |
| 169 | void *ptr; | 169 | void *ptr; |
| 170 | 170 | ||
| 171 | if (mem != -1L) { | 171 | if (mem != -1L) |
| 172 | mem = round_up(mem, align); | ||
| 173 | return __va(mem); | 172 | return __va(mem); |
| 174 | } | 173 | |
| 175 | ptr = __alloc_bootmem_nopanic(size, align, __pa(MAX_DMA_ADDRESS)); | 174 | ptr = __alloc_bootmem_nopanic(size, align, __pa(MAX_DMA_ADDRESS)); |
| 176 | if (ptr == NULL) { | 175 | if (ptr == NULL) { |
| 177 | printk(KERN_ERR "Cannot find %lu bytes in node %d\n", | 176 | printk(KERN_ERR "Cannot find %lu bytes in node %d\n", |