aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorLior Dotan <liodot@gmail.com>2009-02-11 13:35:10 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-17 11:06:27 -0700
commitf7ed550b3ecab4a14f78019ff3e8899add607f92 (patch)
tree8a773a58526126a04290adeed9298da3c07686ae /drivers/staging
parentd203eea8db0b4acbd19ade1aa025ad9b9e0d8863 (diff)
downloadkernel_samsung_crespo-f7ed550b3ecab4a14f78019ff3e8899add607f92.zip
kernel_samsung_crespo-f7ed550b3ecab4a14f78019ff3e8899add607f92.tar.gz
kernel_samsung_crespo-f7ed550b3ecab4a14f78019ff3e8899add607f92.tar.bz2
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 <liodot@gmail.com> Cc: Christopher Harrer <charrer@alacritech.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/slicoss/slicoss.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 79b3d1f..6f5d0bf 100644
--- 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;