From liodot@gmail.com Thu Feb 12 11:44:56 2009 From: Lior Dotan Date: Wed, 11 Feb 2009 13:35:10 +0200 Subject: Staging: SLICOSS: use gfp_kernel where possible To: gregkh@suse.de Cc: Christopher Harrer Message-ID: <4992B7EE.8020601@gmail.com> Use GFP_KERNEL instead of GFP_ATOMIC where possible. Signed_off-by: Lior Dotan Signed-off-by: Greg Kroah-Hartman --- drivers/staging/slicoss/slicoss.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -1492,7 +1492,7 @@ static int slic_mcast_add_list(struct ad } /* Doesn't already exist. Allocate a structure to hold it */ - mcaddr = kmalloc(sizeof(struct mcast_address), GFP_ATOMIC); + mcaddr = kmalloc(sizeof(struct mcast_address), GFP_KERNEL); if (mcaddr == NULL) return 1; @@ -2648,7 +2648,7 @@ static int slic_card_init(struct sliccar #if SLIC_DUMP_ENABLED if (!card->dumpbuffer) { - card->dumpbuffer = kmalloc(DUMP_PAGE_SIZE, GFP_ATOMIC); + card->dumpbuffer = kmalloc(DUMP_PAGE_SIZE, GFP_KERNEL); ASSERT(card->dumpbuffer); if (card->dumpbuffer == NULL) @@ -2667,7 +2667,7 @@ static int slic_card_init(struct sliccar * Allocate COMMAND BUFFER */ if (!card->cmdbuffer) { - card->cmdbuffer = kmalloc(sizeof(struct dump_cmd), GFP_ATOMIC); + card->cmdbuffer = kmalloc(sizeof(struct dump_cmd), GFP_KERNEL); ASSERT(card->cmdbuffer); if (card->cmdbuffer == NULL) @@ -2808,7 +2808,7 @@ static u32 slic_card_locate(struct adapt } if (!physcard) { /* no structure allocated for this physical card yet */ - physcard = kzalloc(sizeof(struct physcard), GFP_ATOMIC); + physcard = kzalloc(sizeof(struct physcard), GFP_KERNEL); ASSERT(physcard); DBG_MSG