diff options
| author | Mark Ware <mware@elphinstone.net> | 2009-07-20 21:51:03 +1000 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2009-07-29 23:22:23 -0500 |
| commit | 6e900de3fff01e84c96632409359a84825c54b28 (patch) | |
| tree | c902ef5c310a0b386e53e7b6faf2e1f26c59dfd6 /drivers | |
| parent | 1333c3d6d35bdb109ddbd4b7086cbf066a27b156 (diff) | |
| download | op-kernel-dev-6e900de3fff01e84c96632409359a84825c54b28.zip op-kernel-dev-6e900de3fff01e84c96632409359a84825c54b28.tar.gz | |
cpm_uart: Don't use alloc_bootmem in cpm_uart_cpm2.c
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_cpm2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c index 141c0a3..a9802e7 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c +++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c @@ -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 |
