From 244a0341d2804f788b4341eb860861899394d6db Mon Sep 17 00:00:00 2001 From: Mark Hounschell Date: Fri, 23 May 2014 14:02:34 -0400 Subject: [PATCH] staging: dgap: Change GFP_ATOMICs to GFP_KERNEL We don't need to use GFP_ATOMIC at driver load time so use GFP_KERNEL instead. Signed-off-by: Mark Hounschell Tested-by: Mark Hounschell Signed-off-by: Greg Kroah-Hartman --- drivers/staging/dgap/dgap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index a89606e..ca264f9 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -1378,7 +1378,7 @@ static int dgap_tty_init(struct board_t *brd) for (i = 0; i < brd->nasync; i++) { if (!brd->channels[i]) { brd->channels[i] = - kzalloc(sizeof(struct channel_t), GFP_ATOMIC); + kzalloc(sizeof(struct channel_t), GFP_KERNEL); if (!brd->channels[i]) return -ENOMEM; } @@ -4121,11 +4121,11 @@ static int dgap_after_config_loaded(int board) /* * allocate flip buffer for board. */ - dgap_board[board]->flipbuf = kmalloc(MYFLIPLEN, GFP_ATOMIC); + dgap_board[board]->flipbuf = kmalloc(MYFLIPLEN, GFP_KERNEL); if (!dgap_board[board]->flipbuf) return -ENOMEM; - dgap_board[board]->flipflagbuf = kmalloc(MYFLIPLEN, GFP_ATOMIC); + dgap_board[board]->flipflagbuf = kmalloc(MYFLIPLEN, GFP_KERNEL); if (!dgap_board[board]->flipflagbuf) { kfree(dgap_board[board]->flipbuf); return -ENOMEM; @@ -7232,7 +7232,7 @@ static struct cnode *dgap_newnode(int t) { struct cnode *n; - n = kmalloc(sizeof(struct cnode), GFP_ATOMIC); + n = kmalloc(sizeof(struct cnode), GFP_KERNEL); if (n) { memset((char *)n, 0, sizeof(struct cnode)); n->type = t; -- 2.7.4