lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] ehea: kzalloc GFP_ATOMIC fix

Browse Source 
This patch fixes kzalloc parameters (GFP_ATOMIC instead of GFP_KERNEL)

Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Jan-Bernd Themann
2006-10-25 13:11:42 +02:00
committed by Jeff Garzik
parent 1e7bed0819
commit 1e1675ccf7
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/ehea/ehea_main.c
View File

@@ -586,8 +586,8 @@ int ehea_sense_port_attr(struct ehea_port *port)
u64 hret; u64 hret;
struct hcp_ehea_port_cb0 *cb0; struct hcp_ehea_port_cb0 *cb0;
cb0 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL); cb0 = kzalloc(H_CB_ALIGNMENT, GFP_ATOMIC); /* May be called via */
if (!cb0) { if (!cb0) { /* ehea_neq_tasklet() */
ehea_error("no mem for cb0"); ehea_error("no mem for cb0");
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
@@ -765,8 +765,7 @@ static void ehea_parse_eqe(struct ehea_adapter *adapter, u64 eqe)
if (EHEA_BMASK_GET(NEQE_PORT_UP, eqe)) { if (EHEA_BMASK_GET(NEQE_PORT_UP, eqe)) {
if (!netif_carrier_ok(port->netdev)) { if (!netif_carrier_ok(port->netdev)) {
ret = ehea_sense_port_attr( ret = ehea_sense_port_attr(port);
port);
if (ret) { if (ret) {
ehea_error("failed resensing port " ehea_error("failed resensing port "
"attributes"); "attributes");
@@ -1502,7 +1501,7 @@ static void ehea_promiscuous(struct net_device *dev, int enable)
if ((enable && port->promisc) || (!enable && !port->promisc)) if ((enable && port->promisc) || (!enable && !port->promisc))
return; return;
cb7 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL); cb7 = kzalloc(H_CB_ALIGNMENT, GFP_ATOMIC);
if (!cb7) { if (!cb7) {
ehea_error("no mem for cb7"); ehea_error("no mem for cb7");
goto out; goto out;
@@ -1606,7 +1605,7 @@ static void ehea_add_multicast_entry(struct ehea_port* port, u8* mc_mac_addr)
struct ehea_mc_list *ehea_mcl_entry; struct ehea_mc_list *ehea_mcl_entry;
u64 hret; u64 hret;
ehea_mcl_entry = kzalloc(sizeof(*ehea_mcl_entry), GFP_KERNEL); ehea_mcl_entry = kzalloc(sizeof(*ehea_mcl_entry), GFP_ATOMIC);
if (!ehea_mcl_entry) { if (!ehea_mcl_entry) {
ehea_error("no mem for mcl_entry"); ehea_error("no mem for mcl_entry");
return; return;