diff options
author | Lior Dotan <liodot@gmail.com> | 2009-02-11 06:35:10 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-17 14:06:27 -0400 |
commit | f7ed550b3ecab4a14f78019ff3e8899add607f92 (patch) | |
tree | 8a773a58526126a04290adeed9298da3c07686ae | |
parent | d203eea8db0b4acbd19ade1aa025ad9b9e0d8863 (diff) |
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>
-rw-r--r-- | drivers/staging/slicoss/slicoss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index 79b3d1f1eff0..6f5d0bff4358 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) | |||
1267 | } | 1267 | } |
1268 | 1268 | ||
1269 | /* Doesn't already exist. Allocate a structure to hold it */ | 1269 | /* Doesn't already exist. Allocate a structure to hold it */ |
1270 | mcaddr = kmalloc(sizeof(struct mcast_address), GFP_KERNEL); | 1270 | mcaddr = kmalloc(sizeof(struct mcast_address), GFP_ATOMIC); |
1271 | if (mcaddr == NULL) | 1271 | if (mcaddr == NULL) |
1272 | return 1; | 1272 | return 1; |
1273 | 1273 | ||
@@ -2291,7 +2291,7 @@ static u32 slic_card_locate(struct adapter *adapter) | |||
2291 | } | 2291 | } |
2292 | if (!physcard) { | 2292 | if (!physcard) { |
2293 | /* no structure allocated for this physical card yet */ | 2293 | /* no structure allocated for this physical card yet */ |
2294 | physcard = kzalloc(sizeof(struct physcard), GFP_KERNEL); | 2294 | physcard = kzalloc(sizeof(struct physcard), GFP_ATOMIC); |
2295 | ASSERT(physcard); | 2295 | ASSERT(physcard); |
2296 | 2296 | ||
2297 | physcard->next = slic_global.phys_card; | 2297 | physcard->next = slic_global.phys_card; |