diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 14:53:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 14:53:20 +0200 |
| commit | f12e6a451aad671a724e61abce2b8b323f209355 (patch) | |
| tree | e4969282d07f7682099291e59545744b3bb5dcac /arch/x86/kernel/pci-dma.c | |
| parent | 046fd53773cd87125f799b00422e487bf1428d38 (diff) | |
| parent | dc44e65943169de2d1a1b494876f48a65a9737f1 (diff) | |
| download | op-kernel-dev-f12e6a451aad671a724e61abce2b8b323f209355.zip op-kernel-dev-f12e6a451aad671a724e61abce2b8b323f209355.tar.gz | |
Merge branch 'x86/cleanups' into x86/signal
Conflicts:
arch/x86/kernel/signal_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/pci-dma.c')
| -rw-r--r-- | arch/x86/kernel/pci-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index 87d4d69..f704cb5 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c @@ -82,7 +82,7 @@ void __init dma32_reserve_bootmem(void) * using 512M as goal */ align = 64ULL<<20; - size = round_up(dma32_bootmem_size, align); + size = roundup(dma32_bootmem_size, align); dma32_bootmem_ptr = __alloc_bootmem_nopanic(size, align, 512ULL<<20); if (dma32_bootmem_ptr) |
