Revert Staging: SLICOSS: use gfp_kernel where possible

Revert commit 2bb347361e2c19799431f56488a3f64de40a3aa6

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 <[email protected]>
Cc: Christopher Harrer <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 79b3d1f1eff0544abcff323b2773e5d59068da71..6f5d0bff4358e9fb3f35a9a5a9771bf35dc1d53b 100644 (file)
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -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;
 
@@ -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;