From 8db397f54e4479d4a7c84aee81c93791a0a4faa9 Mon Sep 17 00:00:00 2001
From: Mark Ware <mware@elphinstone.net>
Date: Mon, 20 Jul 2009 21:51:03 +1000
Subject: [PATCH] --- yaml --- r: 156102 b: refs/heads/master c:
 6e900de3fff01e84c96632409359a84825c54b28 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/serial/cpm_uart/cpm_uart_cpm2.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4c77bf9e2ea0..43eb45a3055d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1333c3d6d35bdb109ddbd4b7086cbf066a27b156
+refs/heads/master: 6e900de3fff01e84c96632409359a84825c54b28
diff --git a/trunk/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/trunk/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index 141c0a3333ad..a9802e76b5fa 100644
--- a/trunk/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/trunk/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