Skip to content

Commit

Permalink
Revert Staging: SLICOSS: use gfp_kernel where possible
Browse files Browse the repository at this point in the history
Revert commit 2bb3473

This commit has been reported to cause problems:
  Mar 24 11:50:31 linuxdev kernel: BUG: sleeping function called from invalid context at mm/slub.c:1599 Mar 24 11:50:31 linuxdev kernel: in_atomic(): 1, irqs_disabled(): 0, pid: 3251, name: avahi-daemon

Cc: Lior Dotan <liodot@gmail.com>
Cc: Christopher Harrer <charrer@alacritech.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Lior Dotan authored and Greg Kroah-Hartman committed Apr 17, 2009
1 parent d203eea commit f7ed550
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/slicoss/slicoss.c
Original file line number Diff line number Diff line change
Expand Up @@ -1267,7 +1267,7 @@ static int slic_mcast_add_list(struct adapter *adapter, char *address)
}

/* Doesn't already exist. Allocate a structure to hold it */
mcaddr = kmalloc(sizeof(struct mcast_address), GFP_KERNEL);
mcaddr = kmalloc(sizeof(struct mcast_address), GFP_ATOMIC);
if (mcaddr == NULL)
return 1;

Expand Down Expand Up @@ -2291,7 +2291,7 @@ static u32 slic_card_locate(struct adapter *adapter)
}
if (!physcard) {
/* no structure allocated for this physical card yet */
physcard = kzalloc(sizeof(struct physcard), GFP_KERNEL);
physcard = kzalloc(sizeof(struct physcard), GFP_ATOMIC);
ASSERT(physcard);

physcard->next = slic_global.phys_card;
Expand Down

0 comments on commit f7ed550

Please sign in to comment.