[PATCH] slab: remove SLAB_ATOMIC
SLAB_ATOMIC is an alias of GFP_ATOMIC Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
f7267c0c07
commit
54e6ecb239
@@ -345,7 +345,7 @@ static void catc_irq_done(struct urb *urb)
|
||||
}
|
||||
}
|
||||
resubmit:
|
||||
status = usb_submit_urb (urb, SLAB_ATOMIC);
|
||||
status = usb_submit_urb (urb, GFP_ATOMIC);
|
||||
if (status)
|
||||
err ("can't resubmit intr, %s-%s, status %d",
|
||||
catc->usbdev->bus->bus_name,
|
||||
|
@@ -383,7 +383,7 @@ static void nc_ensure_sync(struct usbnet *dev)
|
||||
int status;
|
||||
|
||||
/* Send a flush */
|
||||
urb = usb_alloc_urb(0, SLAB_ATOMIC);
|
||||
urb = usb_alloc_urb(0, GFP_ATOMIC);
|
||||
if (!urb)
|
||||
return;
|
||||
|
||||
|
@@ -856,7 +856,7 @@ static void intr_callback(struct urb *urb)
|
||||
pegasus->stats.rx_missed_errors += ((d[3] & 0x7f) << 8) | d[4];
|
||||
}
|
||||
|
||||
status = usb_submit_urb(urb, SLAB_ATOMIC);
|
||||
status = usb_submit_urb(urb, GFP_ATOMIC);
|
||||
if (status == -ENODEV)
|
||||
netif_device_detach(pegasus->net);
|
||||
if (status && netif_msg_timer(pegasus))
|
||||
|
@@ -587,7 +587,7 @@ static void intr_callback(struct urb *urb)
|
||||
}
|
||||
|
||||
resubmit:
|
||||
status = usb_submit_urb (urb, SLAB_ATOMIC);
|
||||
status = usb_submit_urb (urb, GFP_ATOMIC);
|
||||
if (status == -ENODEV)
|
||||
netif_device_detach(dev->netdev);
|
||||
else if (status)
|
||||
|
Reference in New Issue
Block a user