cpm_uart: Don't use alloc_bootmem in cpm_uart_cpm2.c
authorMark Ware <mware@elphinstone.net>
Mon, 20 Jul 2009 11:51:03 +0000 (21:51 +1000)
committerKumar Gala <galak@kernel.crashing.org>
Thu, 30 Jul 2009 04:22:23 +0000 (23:22 -0500)
This is another alloc_bootmem() -> kzalloc() change, this time to
fix the non-fatal badness caused when booting with a cpm2_uart console.

Signed-off-by: Mark Ware <mware@elphinstone.net>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
drivers/serial/cpm_uart/cpm_uart_cpm2.c

index 141c0a3333ad3c8ac8140b5c52b5588a21daf6b2..a9802e76b5fabbd91f44adedb16708fda49f289b 100644 (file)
@@ -132,7 +132,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
        memsz = L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize) +
            L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize);
        if (is_con) {
-               mem_addr = alloc_bootmem(memsz);
+               mem_addr = kzalloc(memsz, GFP_NOWAIT);
                dma_addr = virt_to_bus(mem_addr);
        }
        else