Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e900de3 authored by Mark Ware's avatar Mark Ware Committed by Kumar Gala
Browse files

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: default avatarMark Ware <mware@elphinstone.net>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 1333c3d6

drivers/serial/cpm_uart/cpm_uart_cpm2.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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) +

	memsz = L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize) +

	    L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize);

	    L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize);

	if (is_con) {

	if (is_con) {

		mem_addr = alloc_bootmem(memsz);

		mem_addr = kzalloc(memsz, GFP_NOWAIT);

		dma_addr = virt_to_bus(mem_addr);

		dma_addr = virt_to_bus(mem_addr);

	}

	}

	else

	else