hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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:
Christoph Lameter 2006-12-06 20:33:16 -08:00 committed by Linus Torvalds
parent f7267c0c07
commit 54e6ecb239
55 changed files with 107 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/atm/he.c
View File

@ -1724,7 +1724,7 @@ __alloc_tpd(struct he_dev *he_dev)
struct he_tpd *tpd; struct he_tpd *tpd;
dma_addr_t dma_handle; dma_addr_t dma_handle;
tpd = pci_pool_alloc(he_dev->tpd_pool, SLAB_ATOMIC|SLAB_DMA, &dma_handle); tpd = pci_pool_alloc(he_dev->tpd_pool, GFP_ATOMIC|SLAB_DMA, &dma_handle);
if (tpd == NULL) if (tpd == NULL)
return NULL; return NULL;

2
drivers/base/dmapool.c
View File

@ -297,7 +297,7 @@ restart:
} }
} }
} }
if (!(page = pool_alloc_page (pool, SLAB_ATOMIC))) { if (!(page = pool_alloc_page (pool, GFP_ATOMIC))) {
if (mem_flags & __GFP_WAIT) { if (mem_flags & __GFP_WAIT) {
DECLARE_WAITQUEUE (wait, current); DECLARE_WAITQUEUE (wait, current);

4
drivers/block/DAC960.c
View File

@ -324,13 +324,13 @@ static boolean DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller)
Command->Next = Controller->FreeCommands; Command->Next = Controller->FreeCommands;
Controller->FreeCommands = Command; Controller->FreeCommands = Command;
Controller->Commands[CommandIdentifier-1] = Command; Controller->Commands[CommandIdentifier-1] = Command;
ScatterGatherCPU = pci_pool_alloc(ScatterGatherPool, SLAB_ATOMIC, ScatterGatherCPU = pci_pool_alloc(ScatterGatherPool, GFP_ATOMIC,
&ScatterGatherDMA); &ScatterGatherDMA);
if (ScatterGatherCPU == NULL) if (ScatterGatherCPU == NULL)
return DAC960_Failure(Controller, "AUXILIARY STRUCTURE CREATION"); return DAC960_Failure(Controller, "AUXILIARY STRUCTURE CREATION");
if (RequestSensePool != NULL) { if (RequestSensePool != NULL) {
RequestSenseCPU = pci_pool_alloc(RequestSensePool, SLAB_ATOMIC, RequestSenseCPU = pci_pool_alloc(RequestSensePool, GFP_ATOMIC,
&RequestSenseDMA); &RequestSenseDMA);
if (RequestSenseCPU == NULL) { if (RequestSenseCPU == NULL) {
pci_pool_free(ScatterGatherPool, ScatterGatherCPU, pci_pool_free(ScatterGatherPool, ScatterGatherCPU,

2
drivers/char/watchdog/pcwd_usb.c
View File

@ -634,7 +634,7 @@ static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_devi
usb_pcwd->intr_size = (le16_to_cpu(endpoint->wMaxPacketSize) > 8 ? le16_to_cpu(endpoint->wMaxPacketSize) : 8); usb_pcwd->intr_size = (le16_to_cpu(endpoint->wMaxPacketSize) > 8 ? le16_to_cpu(endpoint->wMaxPacketSize) : 8);
/* set up the memory buffer's */ /* set up the memory buffer's */
if (!(usb_pcwd->intr_buffer = usb_buffer_alloc(udev, usb_pcwd->intr_size, SLAB_ATOMIC, &usb_pcwd->intr_dma))) { if (!(usb_pcwd->intr_buffer = usb_buffer_alloc(udev, usb_pcwd->intr_size, GFP_ATOMIC, &usb_pcwd->intr_dma))) {
printk(KERN_ERR PFX "Out of memory\n"); printk(KERN_ERR PFX "Out of memory\n");
goto error; goto error;
} }

30
drivers/ieee1394/raw1394.c
View File

@ -259,7 +259,7 @@ static void host_reset(struct hpsb_host *host)
if (hi != NULL) { if (hi != NULL) {
list_for_each_entry(fi, &hi->file_info_list, list) { list_for_each_entry(fi, &hi->file_info_list, list) {
if (fi->notification == RAW1394_NOTIFY_ON) { if (fi->notification == RAW1394_NOTIFY_ON) {
req = __alloc_pending_request(SLAB_ATOMIC); req = __alloc_pending_request(GFP_ATOMIC);
if (req != NULL) { if (req != NULL) {
req->file_info = fi; req->file_info = fi;
@ -306,13 +306,13 @@ static void iso_receive(struct hpsb_host *host, int channel, quadlet_t * data,
if (!(fi->listen_channels & (1ULL << channel))) if (!(fi->listen_channels & (1ULL << channel)))
continue; continue;
req = __alloc_pending_request(SLAB_ATOMIC); req = __alloc_pending_request(GFP_ATOMIC);
if (!req) if (!req)
break; break;
if (!ibs) { if (!ibs) {
ibs = kmalloc(sizeof(*ibs) + length, ibs = kmalloc(sizeof(*ibs) + length,
SLAB_ATOMIC); GFP_ATOMIC);
if (!ibs) { if (!ibs) {
kfree(req); kfree(req);
break; break;
@ -367,13 +367,13 @@ static void fcp_request(struct hpsb_host *host, int nodeid, int direction,
if (!fi->fcp_buffer) if (!fi->fcp_buffer)
continue; continue;
req = __alloc_pending_request(SLAB_ATOMIC); req = __alloc_pending_request(GFP_ATOMIC);
if (!req) if (!req)
break; break;
if (!ibs) { if (!ibs) {
ibs = kmalloc(sizeof(*ibs) + length, ibs = kmalloc(sizeof(*ibs) + length,
SLAB_ATOMIC); GFP_ATOMIC);
if (!ibs) { if (!ibs) {
kfree(req); kfree(req);
break; break;
@ -593,7 +593,7 @@ static int state_initialized(struct file_info *fi, struct pending_request *req)
switch (req->req.type) { switch (req->req.type) {
case RAW1394_REQ_LIST_CARDS: case RAW1394_REQ_LIST_CARDS:
spin_lock_irqsave(&host_info_lock, flags); spin_lock_irqsave(&host_info_lock, flags);
khl = kmalloc(sizeof(*khl) * host_count, SLAB_ATOMIC); khl = kmalloc(sizeof(*khl) * host_count, GFP_ATOMIC);
if (khl) { if (khl) {
req->req.misc = host_count; req->req.misc = host_count;
@ -1045,7 +1045,7 @@ static int arm_read(struct hpsb_host *host, int nodeid, quadlet_t * buffer,
} }
if (arm_addr->notification_options & ARM_READ) { if (arm_addr->notification_options & ARM_READ) {
DBGMSG("arm_read -> entering notification-section"); DBGMSG("arm_read -> entering notification-section");
req = __alloc_pending_request(SLAB_ATOMIC); req = __alloc_pending_request(GFP_ATOMIC);
if (!req) { if (!req) {
DBGMSG("arm_read -> rcode_conflict_error"); DBGMSG("arm_read -> rcode_conflict_error");
spin_unlock_irqrestore(&host_info_lock, irqflags); spin_unlock_irqrestore(&host_info_lock, irqflags);
@ -1064,7 +1064,7 @@ static int arm_read(struct hpsb_host *host, int nodeid, quadlet_t * buffer,
sizeof(struct arm_response) + sizeof(struct arm_response) +
sizeof(struct arm_request_response); sizeof(struct arm_request_response);
} }
req->data = kmalloc(size, SLAB_ATOMIC); req->data = kmalloc(size, GFP_ATOMIC);
if (!(req->data)) { if (!(req->data)) {
free_pending_request(req); free_pending_request(req);
DBGMSG("arm_read -> rcode_conflict_error"); DBGMSG("arm_read -> rcode_conflict_error");
@ -1198,7 +1198,7 @@ static int arm_write(struct hpsb_host *host, int nodeid, int destid,
} }
if (arm_addr->notification_options & ARM_WRITE) { if (arm_addr->notification_options & ARM_WRITE) {
DBGMSG("arm_write -> entering notification-section"); DBGMSG("arm_write -> entering notification-section");
req = __alloc_pending_request(SLAB_ATOMIC); req = __alloc_pending_request(GFP_ATOMIC);
if (!req) { if (!req) {
DBGMSG("arm_write -> rcode_conflict_error"); DBGMSG("arm_write -> rcode_conflict_error");
spin_unlock_irqrestore(&host_info_lock, irqflags); spin_unlock_irqrestore(&host_info_lock, irqflags);
@ -1209,7 +1209,7 @@ static int arm_write(struct hpsb_host *host, int nodeid, int destid,
sizeof(struct arm_request) + sizeof(struct arm_response) + sizeof(struct arm_request) + sizeof(struct arm_response) +
(length) * sizeof(byte_t) + (length) * sizeof(byte_t) +
sizeof(struct arm_request_response); sizeof(struct arm_request_response);
req->data = kmalloc(size, SLAB_ATOMIC); req->data = kmalloc(size, GFP_ATOMIC);
if (!(req->data)) { if (!(req->data)) {
free_pending_request(req); free_pending_request(req);
DBGMSG("arm_write -> rcode_conflict_error"); DBGMSG("arm_write -> rcode_conflict_error");
@ -1400,7 +1400,7 @@ static int arm_lock(struct hpsb_host *host, int nodeid, quadlet_t * store,
if (arm_addr->notification_options & ARM_LOCK) { if (arm_addr->notification_options & ARM_LOCK) {
byte_t *buf1, *buf2; byte_t *buf1, *buf2;
DBGMSG("arm_lock -> entering notification-section"); DBGMSG("arm_lock -> entering notification-section");
req = __alloc_pending_request(SLAB_ATOMIC); req = __alloc_pending_request(GFP_ATOMIC);
if (!req) { if (!req) {
DBGMSG("arm_lock -> rcode_conflict_error"); DBGMSG("arm_lock -> rcode_conflict_error");
spin_unlock_irqrestore(&host_info_lock, irqflags); spin_unlock_irqrestore(&host_info_lock, irqflags);
@ -1408,7 +1408,7 @@ static int arm_lock(struct hpsb_host *host, int nodeid, quadlet_t * store,
The request may be retried */ The request may be retried */
} }
size = sizeof(struct arm_request) + sizeof(struct arm_response) + 3 * sizeof(*store) + sizeof(struct arm_request_response); /* maximum */ size = sizeof(struct arm_request) + sizeof(struct arm_response) + 3 * sizeof(*store) + sizeof(struct arm_request_response); /* maximum */
req->data = kmalloc(size, SLAB_ATOMIC); req->data = kmalloc(size, GFP_ATOMIC);
if (!(req->data)) { if (!(req->data)) {
free_pending_request(req); free_pending_request(req);
DBGMSG("arm_lock -> rcode_conflict_error"); DBGMSG("arm_lock -> rcode_conflict_error");
@ -1628,7 +1628,7 @@ static int arm_lock64(struct hpsb_host *host, int nodeid, octlet_t * store,
if (arm_addr->notification_options & ARM_LOCK) { if (arm_addr->notification_options & ARM_LOCK) {
byte_t *buf1, *buf2; byte_t *buf1, *buf2;
DBGMSG("arm_lock64 -> entering notification-section"); DBGMSG("arm_lock64 -> entering notification-section");
req = __alloc_pending_request(SLAB_ATOMIC); req = __alloc_pending_request(GFP_ATOMIC);
if (!req) { if (!req) {
spin_unlock_irqrestore(&host_info_lock, irqflags); spin_unlock_irqrestore(&host_info_lock, irqflags);
DBGMSG("arm_lock64 -> rcode_conflict_error"); DBGMSG("arm_lock64 -> rcode_conflict_error");
@ -1636,7 +1636,7 @@ static int arm_lock64(struct hpsb_host *host, int nodeid, octlet_t * store,
The request may be retried */ The request may be retried */
} }
size = sizeof(struct arm_request) + sizeof(struct arm_response) + 3 * sizeof(*store) + sizeof(struct arm_request_response); /* maximum */ size = sizeof(struct arm_request) + sizeof(struct arm_response) + 3 * sizeof(*store) + sizeof(struct arm_request_response); /* maximum */
req->data = kmalloc(size, SLAB_ATOMIC); req->data = kmalloc(size, GFP_ATOMIC);
if (!(req->data)) { if (!(req->data)) {
free_pending_request(req); free_pending_request(req);
spin_unlock_irqrestore(&host_info_lock, irqflags); spin_unlock_irqrestore(&host_info_lock, irqflags);
@ -2443,7 +2443,7 @@ static void queue_rawiso_event(struct file_info *fi)
/* only one ISO activity event may be in the queue */ /* only one ISO activity event may be in the queue */
if (!__rawiso_event_in_queue(fi)) { if (!__rawiso_event_in_queue(fi)) {
struct pending_request *req = struct pending_request *req =
__alloc_pending_request(SLAB_ATOMIC); __alloc_pending_request(GFP_ATOMIC);
if (req) { if (req) {
req->file_info = fi; req->file_info = fi;

2
drivers/infiniband/hw/amso1100/c2_vq.c
View File

@ -164,7 +164,7 @@ void vq_req_put(struct c2_dev *c2dev, struct c2_vq_req *r)
*/ */
void *vq_repbuf_alloc(struct c2_dev *c2dev) void *vq_repbuf_alloc(struct c2_dev *c2dev)
{ {
return kmem_cache_alloc(c2dev->host_msg_cache, SLAB_ATOMIC); return kmem_cache_alloc(c2dev->host_msg_cache, GFP_ATOMIC);
} }
/* /*

2
drivers/infiniband/hw/mthca/mthca_av.c
View File

@ -189,7 +189,7 @@ int mthca_create_ah(struct mthca_dev *dev,
on_hca_fail: on_hca_fail:
if (ah->type == MTHCA_AH_PCI_POOL) { if (ah->type == MTHCA_AH_PCI_POOL) {
ah->av = pci_pool_alloc(dev->av_table.pool, ah->av = pci_pool_alloc(dev->av_table.pool,
SLAB_ATOMIC, &ah->avdma); GFP_ATOMIC, &ah->avdma);
if (!ah->av) if (!ah->av)
return -ENOMEM; return -ENOMEM;

20
drivers/isdn/gigaset/bas-gigaset.c
View File

@ -572,7 +572,7 @@ static int atread_submit(struct cardstate *cs, int timeout)
ucs->rcvbuf, ucs->rcvbuf_size, ucs->rcvbuf, ucs->rcvbuf_size,
read_ctrl_callback, cs->inbuf); read_ctrl_callback, cs->inbuf);
if ((ret = usb_submit_urb(ucs->urb_cmd_in, SLAB_ATOMIC)) != 0) { if ((ret = usb_submit_urb(ucs->urb_cmd_in, GFP_ATOMIC)) != 0) {
update_basstate(ucs, 0, BS_ATRDPEND); update_basstate(ucs, 0, BS_ATRDPEND);
dev_err(cs->dev, "could not submit HD_READ_ATMESSAGE: %s\n", dev_err(cs->dev, "could not submit HD_READ_ATMESSAGE: %s\n",
get_usb_rcmsg(ret)); get_usb_rcmsg(ret));
@ -747,7 +747,7 @@ static void read_int_callback(struct urb *urb)
check_pending(ucs); check_pending(ucs);
resubmit: resubmit:
rc = usb_submit_urb(urb, SLAB_ATOMIC); rc = usb_submit_urb(urb, GFP_ATOMIC);
if (unlikely(rc != 0 && rc != -ENODEV)) { if (unlikely(rc != 0 && rc != -ENODEV)) {
dev_err(cs->dev, "could not resubmit interrupt URB: %s\n", dev_err(cs->dev, "could not resubmit interrupt URB: %s\n",
get_usb_rcmsg(rc)); get_usb_rcmsg(rc));
@ -807,7 +807,7 @@ static void read_iso_callback(struct urb *urb)
urb->number_of_packets = BAS_NUMFRAMES; urb->number_of_packets = BAS_NUMFRAMES;
gig_dbg(DEBUG_ISO, "%s: isoc read overrun/resubmit", gig_dbg(DEBUG_ISO, "%s: isoc read overrun/resubmit",
__func__); __func__);
rc = usb_submit_urb(urb, SLAB_ATOMIC); rc = usb_submit_urb(urb, GFP_ATOMIC);
if (unlikely(rc != 0 && rc != -ENODEV)) { if (unlikely(rc != 0 && rc != -ENODEV)) {
dev_err(bcs->cs->dev, dev_err(bcs->cs->dev,
"could not resubmit isochronous read " "could not resubmit isochronous read "
@ -900,7 +900,7 @@ static int starturbs(struct bc_state *bcs)
} }
dump_urb(DEBUG_ISO, "Initial isoc read", urb); dump_urb(DEBUG_ISO, "Initial isoc read", urb);
if ((rc = usb_submit_urb(urb, SLAB_ATOMIC)) != 0) if ((rc = usb_submit_urb(urb, GFP_ATOMIC)) != 0)
goto error; goto error;
} }
@ -935,7 +935,7 @@ static int starturbs(struct bc_state *bcs)
/* submit two URBs, keep third one */ /* submit two URBs, keep third one */
for (k = 0; k < 2; ++k) { for (k = 0; k < 2; ++k) {
dump_urb(DEBUG_ISO, "Initial isoc write", urb); dump_urb(DEBUG_ISO, "Initial isoc write", urb);
rc = usb_submit_urb(ubc->isoouturbs[k].urb, SLAB_ATOMIC); rc = usb_submit_urb(ubc->isoouturbs[k].urb, GFP_ATOMIC);
if (rc != 0) if (rc != 0)
goto error; goto error;
} }
@ -1042,7 +1042,7 @@ static int submit_iso_write_urb(struct isow_urbctx_t *ucx)
return 0; /* no data to send */ return 0; /* no data to send */
urb->number_of_packets = nframe; urb->number_of_packets = nframe;
rc = usb_submit_urb(urb, SLAB_ATOMIC); rc = usb_submit_urb(urb, GFP_ATOMIC);
if (unlikely(rc)) { if (unlikely(rc)) {
if (rc == -ENODEV) if (rc == -ENODEV)
/* device removed - give up silently */ /* device removed - give up silently */
@ -1341,7 +1341,7 @@ static void read_iso_tasklet(unsigned long data)
urb->dev = bcs->cs->hw.bas->udev; urb->dev = bcs->cs->hw.bas->udev;
urb->transfer_flags = URB_ISO_ASAP; urb->transfer_flags = URB_ISO_ASAP;
urb->number_of_packets = BAS_NUMFRAMES; urb->number_of_packets = BAS_NUMFRAMES;
rc = usb_submit_urb(urb, SLAB_ATOMIC); rc = usb_submit_urb(urb, GFP_ATOMIC);
if (unlikely(rc != 0 && rc != -ENODEV)) { if (unlikely(rc != 0 && rc != -ENODEV)) {
dev_err(cs->dev, dev_err(cs->dev,
"could not resubmit isochronous read URB: %s\n", "could not resubmit isochronous read URB: %s\n",
@ -1458,7 +1458,7 @@ static void write_ctrl_callback(struct urb *urb)
ucs->retry_ctrl); ucs->retry_ctrl);
/* urb->dev is clobbered by USB subsystem */ /* urb->dev is clobbered by USB subsystem */
urb->dev = ucs->udev; urb->dev = ucs->udev;
rc = usb_submit_urb(urb, SLAB_ATOMIC); rc = usb_submit_urb(urb, GFP_ATOMIC);
if (unlikely(rc)) { if (unlikely(rc)) {
dev_err(&ucs->interface->dev, dev_err(&ucs->interface->dev,
"could not resubmit request 0x%02x: %s\n", "could not resubmit request 0x%02x: %s\n",
@ -1517,7 +1517,7 @@ static int req_submit(struct bc_state *bcs, int req, int val, int timeout)
(unsigned char*) &ucs->dr_ctrl, NULL, 0, (unsigned char*) &ucs->dr_ctrl, NULL, 0,
write_ctrl_callback, ucs); write_ctrl_callback, ucs);
ucs->retry_ctrl = 0; ucs->retry_ctrl = 0;
ret = usb_submit_urb(ucs->urb_ctrl, SLAB_ATOMIC); ret = usb_submit_urb(ucs->urb_ctrl, GFP_ATOMIC);
if (unlikely(ret)) { if (unlikely(ret)) {
dev_err(bcs->cs->dev, "could not submit request 0x%02x: %s\n", dev_err(bcs->cs->dev, "could not submit request 0x%02x: %s\n",
req, get_usb_rcmsg(ret)); req, get_usb_rcmsg(ret));
@ -1763,7 +1763,7 @@ static int atwrite_submit(struct cardstate *cs, unsigned char *buf, int len)
usb_sndctrlpipe(ucs->udev, 0), usb_sndctrlpipe(ucs->udev, 0),
(unsigned char*) &ucs->dr_cmd_out, buf, len, (unsigned char*) &ucs->dr_cmd_out, buf, len,
write_command_callback, cs); write_command_callback, cs);
rc = usb_submit_urb(ucs->urb_cmd_out, SLAB_ATOMIC); rc = usb_submit_urb(ucs->urb_cmd_out, GFP_ATOMIC);
if (unlikely(rc)) { if (unlikely(rc)) {
update_basstate(ucs, 0, BS_ATWRPEND); update_basstate(ucs, 0, BS_ATWRPEND);
dev_err(cs->dev, "could not submit HD_WRITE_ATMESSAGE: %s\n", dev_err(cs->dev, "could not submit HD_WRITE_ATMESSAGE: %s\n",

6
drivers/isdn/gigaset/usb-gigaset.c
View File

@ -410,7 +410,7 @@ static void gigaset_read_int_callback(struct urb *urb)
if (resubmit) { if (resubmit) {
spin_lock_irqsave(&cs->lock, flags); spin_lock_irqsave(&cs->lock, flags);
r = cs->connected ? usb_submit_urb(urb, SLAB_ATOMIC) : -ENODEV; r = cs->connected ? usb_submit_urb(urb, GFP_ATOMIC) : -ENODEV;
spin_unlock_irqrestore(&cs->lock, flags); spin_unlock_irqrestore(&cs->lock, flags);
if (r) if (r)
dev_err(cs->dev, "error %d when resubmitting urb.\n", dev_err(cs->dev, "error %d when resubmitting urb.\n",
@ -486,7 +486,7 @@ static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb)
atomic_set(&ucs->busy, 1); atomic_set(&ucs->busy, 1);
spin_lock_irqsave(&cs->lock, flags); spin_lock_irqsave(&cs->lock, flags);
status = cs->connected ? usb_submit_urb(ucs->bulk_out_urb, SLAB_ATOMIC) : -ENODEV; status = cs->connected ? usb_submit_urb(ucs->bulk_out_urb, GFP_ATOMIC) : -ENODEV;
spin_unlock_irqrestore(&cs->lock, flags); spin_unlock_irqrestore(&cs->lock, flags);
if (status) { if (status) {
@ -664,7 +664,7 @@ static int write_modem(struct cardstate *cs)
ucs->bulk_out_endpointAddr & 0x0f), ucs->bulk_out_endpointAddr & 0x0f),
ucs->bulk_out_buffer, count, ucs->bulk_out_buffer, count,
gigaset_write_bulk_callback, cs); gigaset_write_bulk_callback, cs);
ret = usb_submit_urb(ucs->bulk_out_urb, SLAB_ATOMIC); ret = usb_submit_urb(ucs->bulk_out_urb, GFP_ATOMIC);
} else { } else {
ret = -ENODEV; ret = -ENODEV;
} }

2
drivers/media/dvb/dvb-usb/usb-urb.c
View File

@ -116,7 +116,7 @@ static int usb_allocate_stream_buffers(struct usb_data_stream *stream, int num,
for (stream->buf_num = 0; stream->buf_num < num; stream->buf_num++) { for (stream->buf_num = 0; stream->buf_num < num; stream->buf_num++) {
deb_mem("allocating buffer %d\n",stream->buf_num); deb_mem("allocating buffer %d\n",stream->buf_num);
if (( stream->buf_list[stream->buf_num] = if (( stream->buf_list[stream->buf_num] =
usb_buffer_alloc(stream->udev, size, SLAB_ATOMIC, usb_buffer_alloc(stream->udev, size, GFP_ATOMIC,
&stream->dma_addr[stream->buf_num]) ) == NULL) { &stream->dma_addr[stream->buf_num]) ) == NULL) {
deb_mem("not enough memory for urb-buffer allocation.\n"); deb_mem("not enough memory for urb-buffer allocation.\n");
usb_free_stream_buffers(stream); usb_free_stream_buffers(stream);

2
drivers/media/dvb/ttusb-dec/ttusb_dec.c
View File

@ -1244,7 +1244,7 @@ static int ttusb_dec_init_usb(struct ttusb_dec *dec)
return -ENOMEM; return -ENOMEM;
} }
dec->irq_buffer = usb_buffer_alloc(dec->udev,IRQ_PACKET_SIZE, dec->irq_buffer = usb_buffer_alloc(dec->udev,IRQ_PACKET_SIZE,
SLAB_ATOMIC, &dec->irq_dma_handle); GFP_ATOMIC, &dec->irq_dma_handle);
if(!dec->irq_buffer) { if(!dec->irq_buffer) {
return -ENOMEM; return -ENOMEM;
} }

2
drivers/s390/scsi/zfcp_fsf.c
View File

@ -109,7 +109,7 @@ zfcp_fsf_req_alloc(mempool_t *pool, int req_flags)
ptr = kmalloc(size, GFP_ATOMIC); ptr = kmalloc(size, GFP_ATOMIC);
else else
ptr = kmem_cache_alloc(zfcp_data.fsf_req_qtcb_cache, ptr = kmem_cache_alloc(zfcp_data.fsf_req_qtcb_cache,
SLAB_ATOMIC); GFP_ATOMIC);
} }
if (unlikely(!ptr)) if (unlikely(!ptr))

2
drivers/usb/core/hub.c
View File

@ -460,7 +460,7 @@ void usb_hub_tt_clear_buffer (struct usb_device *udev, int pipe)
* since each TT has "at least two" buffers that can need it (and * since each TT has "at least two" buffers that can need it (and
* there can be many TTs per hub). even if they're uncommon. * there can be many TTs per hub). even if they're uncommon.
*/ */
if ((clear = kmalloc (sizeof *clear, SLAB_ATOMIC)) == NULL) { if ((clear = kmalloc (sizeof *clear, GFP_ATOMIC)) == NULL) {
dev_err (&udev->dev, "can't save CLEAR_TT_BUFFER state\n"); dev_err (&udev->dev, "can't save CLEAR_TT_BUFFER state\n");
/* FIXME recover somehow ... RESET_TT? */ /* FIXME recover somehow ... RESET_TT? */
return; return;

2
drivers/usb/core/message.c
View File

@ -488,7 +488,7 @@ void usb_sg_wait (struct usb_sg_request *io)
int retval; int retval;
io->urbs [i]->dev = io->dev; io->urbs [i]->dev = io->dev;
retval = usb_submit_urb (io->urbs [i], SLAB_ATOMIC); retval = usb_submit_urb (io->urbs [i], GFP_ATOMIC);
/* after we submit, let completions or cancelations fire; /* after we submit, let completions or cancelations fire;
* we handshake using io->status. * we handshake using io->status.

2
drivers/usb/host/ehci-dbg.c
View File

@ -492,7 +492,7 @@ show_periodic (struct class_device *class_dev, char *buf)
unsigned i; unsigned i;
__le32 tag; __le32 tag;
if (!(seen = kmalloc (DBG_SCHED_LIMIT * sizeof *seen, SLAB_ATOMIC))) if (!(seen = kmalloc (DBG_SCHED_LIMIT * sizeof *seen, GFP_ATOMIC)))
return 0; return 0;
seen_count = 0; seen_count = 0;

10
drivers/usb/host/hc_crisv10.c
View File

@ -188,7 +188,7 @@ static DEFINE_TIMER(bulk_eot_timer, NULL, 0, 0);
#define CHECK_ALIGN(x) if (((__u32)(x)) & 0x00000003) \ #define CHECK_ALIGN(x) if (((__u32)(x)) & 0x00000003) \
{panic("Alignment check (DWORD) failed at %s:%s:%d\n", __FILE__, __FUNCTION__, __LINE__);} {panic("Alignment check (DWORD) failed at %s:%s:%d\n", __FILE__, __FUNCTION__, __LINE__);}
#define SLAB_FLAG (in_interrupt() ? SLAB_ATOMIC : SLAB_KERNEL) #define SLAB_FLAG (in_interrupt() ? GFP_ATOMIC : SLAB_KERNEL)
#define KMALLOC_FLAG (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL) #define KMALLOC_FLAG (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL)
/* Most helpful debugging aid */ /* Most helpful debugging aid */
@ -1743,7 +1743,7 @@ static irqreturn_t etrax_usb_tx_interrupt(int irq, void *vhc)
*R_DMA_CH8_SUB3_CLR_INTR = IO_STATE(R_DMA_CH8_SUB3_CLR_INTR, clr_descr, do); *R_DMA_CH8_SUB3_CLR_INTR = IO_STATE(R_DMA_CH8_SUB3_CLR_INTR, clr_descr, do);
comp_data = (usb_isoc_complete_data_t*)kmem_cache_alloc(isoc_compl_cache, SLAB_ATOMIC); comp_data = (usb_isoc_complete_data_t*)kmem_cache_alloc(isoc_compl_cache, GFP_ATOMIC);
assert(comp_data != NULL); assert(comp_data != NULL);
INIT_WORK(&comp_data->usb_bh, etrax_usb_isoc_descr_interrupt_bottom_half, comp_data); INIT_WORK(&comp_data->usb_bh, etrax_usb_isoc_descr_interrupt_bottom_half, comp_data);
@ -3010,7 +3010,7 @@ static void etrax_usb_add_to_isoc_sb_list(struct urb *urb, int epid)
if (!urb->iso_frame_desc[i].length) if (!urb->iso_frame_desc[i].length)
continue; continue;
next_sb_desc = (USB_SB_Desc_t*)kmem_cache_alloc(usb_desc_cache, SLAB_ATOMIC); next_sb_desc = (USB_SB_Desc_t*)kmem_cache_alloc(usb_desc_cache, GFP_ATOMIC);
assert(next_sb_desc != NULL); assert(next_sb_desc != NULL);
if (urb->iso_frame_desc[i].length > 0) { if (urb->iso_frame_desc[i].length > 0) {
@ -3063,7 +3063,7 @@ static void etrax_usb_add_to_isoc_sb_list(struct urb *urb, int epid)
if (TxIsocEPList[epid].sub == 0) { if (TxIsocEPList[epid].sub == 0) {
dbg_isoc("Isoc traffic not already running, allocating SB"); dbg_isoc("Isoc traffic not already running, allocating SB");
next_sb_desc = (USB_SB_Desc_t*)kmem_cache_alloc(usb_desc_cache, SLAB_ATOMIC); next_sb_desc = (USB_SB_Desc_t*)kmem_cache_alloc(usb_desc_cache, GFP_ATOMIC);
assert(next_sb_desc != NULL); assert(next_sb_desc != NULL);
next_sb_desc->command = (IO_STATE(USB_SB_command, tt, in) | next_sb_desc->command = (IO_STATE(USB_SB_command, tt, in) |
@ -3317,7 +3317,7 @@ static irqreturn_t etrax_usb_hc_interrupt_top_half(int irq, void *vhc)
restore_flags(flags); restore_flags(flags);
reg = (usb_interrupt_registers_t *)kmem_cache_alloc(top_half_reg_cache, SLAB_ATOMIC); reg = (usb_interrupt_registers_t *)kmem_cache_alloc(top_half_reg_cache, GFP_ATOMIC);
assert(reg != NULL); assert(reg != NULL);

2
drivers/usb/host/ohci-dbg.c
View File

@ -505,7 +505,7 @@ show_periodic (struct class_device *class_dev, char *buf)
char *next; char *next;
unsigned i; unsigned i;
if (!(seen = kmalloc (DBG_SCHED_LIMIT * sizeof *seen, SLAB_ATOMIC))) if (!(seen = kmalloc (DBG_SCHED_LIMIT * sizeof *seen, GFP_ATOMIC)))
return 0; return 0;
seen_count = 0; seen_count = 0;

2
drivers/usb/host/uhci-q.c
View File

@ -498,7 +498,7 @@ static inline struct urb_priv *uhci_alloc_urb_priv(struct uhci_hcd *uhci,
{ {
struct urb_priv *urbp; struct urb_priv *urbp;
urbp = kmem_cache_alloc(uhci_up_cachep, SLAB_ATOMIC); urbp = kmem_cache_alloc(uhci_up_cachep, GFP_ATOMIC);
if (!urbp) if (!urbp)
return NULL; return NULL;

2
drivers/usb/input/aiptek.c
View File

@ -1988,7 +1988,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
goto fail1; goto fail1;
aiptek->data = usb_buffer_alloc(usbdev, AIPTEK_PACKET_LENGTH, aiptek->data = usb_buffer_alloc(usbdev, AIPTEK_PACKET_LENGTH,
SLAB_ATOMIC, &aiptek->data_dma); GFP_ATOMIC, &aiptek->data_dma);
if (!aiptek->data) if (!aiptek->data)
goto fail1; goto fail1;

6
drivers/usb/input/ati_remote.c
View File

@ -592,7 +592,7 @@ static void ati_remote_irq_in(struct urb *urb)
__FUNCTION__, urb->status); __FUNCTION__, urb->status);
} }
retval = usb_submit_urb(urb, SLAB_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval)
dev_err(&ati_remote->interface->dev, "%s: usb_submit_urb()=%d\n", dev_err(&ati_remote->interface->dev, "%s: usb_submit_urb()=%d\n",
__FUNCTION__, retval); __FUNCTION__, retval);
@ -604,12 +604,12 @@ static void ati_remote_irq_in(struct urb *urb)
static int ati_remote_alloc_buffers(struct usb_device *udev, static int ati_remote_alloc_buffers(struct usb_device *udev,
struct ati_remote *ati_remote) struct ati_remote *ati_remote)
{ {
ati_remote->inbuf = usb_buffer_alloc(udev, DATA_BUFSIZE, SLAB_ATOMIC, ati_remote->inbuf = usb_buffer_alloc(udev, DATA_BUFSIZE, GFP_ATOMIC,
&ati_remote->inbuf_dma); &ati_remote->inbuf_dma);
if (!ati_remote->inbuf) if (!ati_remote->inbuf)
return -1; return -1;
ati_remote->outbuf = usb_buffer_alloc(udev, DATA_BUFSIZE, SLAB_ATOMIC, ati_remote->outbuf = usb_buffer_alloc(udev, DATA_BUFSIZE, GFP_ATOMIC,
&ati_remote->outbuf_dma); &ati_remote->outbuf_dma);
if (!ati_remote->outbuf) if (!ati_remote->outbuf)
return -1; return -1;

10
drivers/usb/input/hid-core.c
View File

@ -1079,7 +1079,7 @@ static void hid_irq_in(struct urb *urb)
warn("input irq status %d received", urb->status); warn("input irq status %d received", urb->status);
} }
status = usb_submit_urb(urb, SLAB_ATOMIC); status = usb_submit_urb(urb, GFP_ATOMIC);
if (status) { if (status) {
clear_bit(HID_IN_RUNNING, &hid->iofl); clear_bit(HID_IN_RUNNING, &hid->iofl);
if (status != -EPERM) { if (status != -EPERM) {
@ -1864,13 +1864,13 @@ static void hid_find_max_report(struct hid_device *hid, unsigned int type, int *
static int hid_alloc_buffers(struct usb_device *dev, struct hid_device *hid) static int hid_alloc_buffers(struct usb_device *dev, struct hid_device *hid)
{ {
if (!(hid->inbuf = usb_buffer_alloc(dev, hid->bufsize, SLAB_ATOMIC, &hid->inbuf_dma))) if (!(hid->inbuf = usb_buffer_alloc(dev, hid->bufsize, GFP_ATOMIC, &hid->inbuf_dma)))
return -1; return -1;
if (!(hid->outbuf = usb_buffer_alloc(dev, hid->bufsize, SLAB_ATOMIC, &hid->outbuf_dma))) if (!(hid->outbuf = usb_buffer_alloc(dev, hid->bufsize, GFP_ATOMIC, &hid->outbuf_dma)))
return -1; return -1;
if (!(hid->cr = usb_buffer_alloc(dev, sizeof(*(hid->cr)), SLAB_ATOMIC, &hid->cr_dma))) if (!(hid->cr = usb_buffer_alloc(dev, sizeof(*(hid->cr)), GFP_ATOMIC, &hid->cr_dma)))
return -1; return -1;
if (!(hid->ctrlbuf = usb_buffer_alloc(dev, hid->bufsize, SLAB_ATOMIC, &hid->ctrlbuf_dma))) if (!(hid->ctrlbuf = usb_buffer_alloc(dev, hid->bufsize, GFP_ATOMIC, &hid->ctrlbuf_dma)))
return -1; return -1;
return 0; return 0;

2
drivers/usb/input/keyspan_remote.c
View File

@ -456,7 +456,7 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
remote->in_endpoint = endpoint; remote->in_endpoint = endpoint;
remote->toggle = -1; /* Set to -1 so we will always not match the toggle from the first remote message. */ remote->toggle = -1; /* Set to -1 so we will always not match the toggle from the first remote message. */
remote->in_buffer = usb_buffer_alloc(udev, RECV_SIZE, SLAB_ATOMIC, &remote->in_dma); remote->in_buffer = usb_buffer_alloc(udev, RECV_SIZE, GFP_ATOMIC, &remote->in_dma);
if (!remote->in_buffer) { if (!remote->in_buffer) {
retval = -ENOMEM; retval = -ENOMEM;
goto fail1; goto fail1;

2
drivers/usb/input/mtouchusb.c
View File

@ -164,7 +164,7 @@ static int mtouchusb_alloc_buffers(struct usb_device *udev, struct mtouch_usb *m
dbg("%s - called", __FUNCTION__); dbg("%s - called", __FUNCTION__);
mtouch->data = usb_buffer_alloc(udev, MTOUCHUSB_REPORT_DATA_SIZE, mtouch->data = usb_buffer_alloc(udev, MTOUCHUSB_REPORT_DATA_SIZE,
SLAB_ATOMIC, &mtouch->data_dma); GFP_ATOMIC, &mtouch->data_dma);
if (!mtouch->data) if (!mtouch->data)
return -1; return -1;

4
drivers/usb/input/powermate.c
View File

@ -277,12 +277,12 @@ static int powermate_input_event(struct input_dev *dev, unsigned int type, unsig
static int powermate_alloc_buffers(struct usb_device *udev, struct powermate_device *pm) static int powermate_alloc_buffers(struct usb_device *udev, struct powermate_device *pm)
{ {
pm->data = usb_buffer_alloc(udev, POWERMATE_PAYLOAD_SIZE_MAX, pm->data = usb_buffer_alloc(udev, POWERMATE_PAYLOAD_SIZE_MAX,
SLAB_ATOMIC, &pm->data_dma); GFP_ATOMIC, &pm->data_dma);
if (!pm->data) if (!pm->data)
return -1; return -1;
pm->configcr = usb_buffer_alloc(udev, sizeof(*(pm->configcr)), pm->configcr = usb_buffer_alloc(udev, sizeof(*(pm->configcr)),
SLAB_ATOMIC, &pm->configcr_dma); GFP_ATOMIC, &pm->configcr_dma);
if (!pm->configcr) if (!pm->configcr)
return -1; return -1;

2
drivers/usb/input/touchkitusb.c
View File

@ -248,7 +248,7 @@ static int touchkit_alloc_buffers(struct usb_device *udev,
struct touchkit_usb *touchkit) struct touchkit_usb *touchkit)
{ {
touchkit->data = usb_buffer_alloc(udev, TOUCHKIT_REPORT_DATA_SIZE, touchkit->data = usb_buffer_alloc(udev, TOUCHKIT_REPORT_DATA_SIZE,
SLAB_ATOMIC, &touchkit->data_dma); GFP_ATOMIC, &touchkit->data_dma);
if (!touchkit->data) if (!touchkit->data)
return -1; return -1;

8
drivers/usb/input/usbkbd.c
View File

@ -122,7 +122,7 @@ static void usb_kbd_irq(struct urb *urb)
memcpy(kbd->old, kbd->new, 8); memcpy(kbd->old, kbd->new, 8);
resubmit: resubmit:
i = usb_submit_urb (urb, SLAB_ATOMIC); i = usb_submit_urb (urb, GFP_ATOMIC);
if (i) if (i)
err ("can't resubmit intr, %s-%s/input0, status %d", err ("can't resubmit intr, %s-%s/input0, status %d",
kbd->usbdev->bus->bus_name, kbd->usbdev->bus->bus_name,
@ -196,11 +196,11 @@ static int usb_kbd_alloc_mem(struct usb_device *dev, struct usb_kbd *kbd)
return -1; return -1;
if (!(kbd->led = usb_alloc_urb(0, GFP_KERNEL))) if (!(kbd->led = usb_alloc_urb(0, GFP_KERNEL)))
return -1; return -1;
if (!(kbd->new = usb_buffer_alloc(dev, 8, SLAB_ATOMIC, &kbd->new_dma))) if (!(kbd->new = usb_buffer_alloc(dev, 8, GFP_ATOMIC, &kbd->new_dma)))
return -1; return -1;
if (!(kbd->cr = usb_buffer_alloc(dev, sizeof(struct usb_ctrlrequest), SLAB_ATOMIC, &kbd->cr_dma))) if (!(kbd->cr = usb_buffer_alloc(dev, sizeof(struct usb_ctrlrequest), GFP_ATOMIC, &kbd->cr_dma)))
return -1; return -1;
if (!(kbd->leds = usb_buffer_alloc(dev, 1, SLAB_ATOMIC, &kbd->leds_dma))) if (!(kbd->leds = usb_buffer_alloc(dev, 1, GFP_ATOMIC, &kbd->leds_dma)))
return -1; return -1;
return 0; return 0;

4
drivers/usb/input/usbmouse.c
View File

@ -86,7 +86,7 @@ static void usb_mouse_irq(struct urb *urb)
input_sync(dev); input_sync(dev);
resubmit: resubmit:
status = usb_submit_urb (urb, SLAB_ATOMIC); status = usb_submit_urb (urb, GFP_ATOMIC);
if (status) if (status)
err ("can't resubmit intr, %s-%s/input0, status %d", err ("can't resubmit intr, %s-%s/input0, status %d",
mouse->usbdev->bus->bus_name, mouse->usbdev->bus->bus_name,
@ -137,7 +137,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i
if (!mouse || !input_dev) if (!mouse || !input_dev)
goto fail1; goto fail1;
mouse->data = usb_buffer_alloc(dev, 8, SLAB_ATOMIC, &mouse->data_dma); mouse->data = usb_buffer_alloc(dev, 8, GFP_ATOMIC, &mouse->data_dma);
if (!mouse->data) if (!mouse->data)
goto fail1; goto fail1;

2
drivers/usb/input/xpad.c
View File

@ -325,7 +325,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
goto fail1; goto fail1;
xpad->idata = usb_buffer_alloc(udev, XPAD_PKT_LEN, xpad->idata = usb_buffer_alloc(udev, XPAD_PKT_LEN,
SLAB_ATOMIC, &xpad->idata_dma); GFP_ATOMIC, &xpad->idata_dma);
if (!xpad->idata) if (!xpad->idata)
goto fail1; goto fail1;

6
drivers/usb/input/yealink.c
View File

@ -874,17 +874,17 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
/* allocate usb buffers */ /* allocate usb buffers */
yld->irq_data = usb_buffer_alloc(udev, USB_PKT_LEN, yld->irq_data = usb_buffer_alloc(udev, USB_PKT_LEN,
SLAB_ATOMIC, &yld->irq_dma); GFP_ATOMIC, &yld->irq_dma);
if (yld->irq_data == NULL) if (yld->irq_data == NULL)
return usb_cleanup(yld, -ENOMEM); return usb_cleanup(yld, -ENOMEM);
yld->ctl_data = usb_buffer_alloc(udev, USB_PKT_LEN, yld->ctl_data = usb_buffer_alloc(udev, USB_PKT_LEN,
SLAB_ATOMIC, &yld->ctl_dma); GFP_ATOMIC, &yld->ctl_dma);
if (!yld->ctl_data) if (!yld->ctl_data)
return usb_cleanup(yld, -ENOMEM); return usb_cleanup(yld, -ENOMEM);
yld->ctl_req = usb_buffer_alloc(udev, sizeof(*(yld->ctl_req)), yld->ctl_req = usb_buffer_alloc(udev, sizeof(*(yld->ctl_req)),
SLAB_ATOMIC, &yld->ctl_req_dma); GFP_ATOMIC, &yld->ctl_req_dma);
if (yld->ctl_req == NULL) if (yld->ctl_req == NULL)
return usb_cleanup(yld, -ENOMEM); return usb_cleanup(yld, -ENOMEM);

4
drivers/usb/misc/phidgetkit.c
View File

@ -377,7 +377,7 @@ static void interfacekit_irq(struct urb *urb)
schedule_delayed_work(&kit->do_notify, 0); schedule_delayed_work(&kit->do_notify, 0);
resubmit: resubmit:
status = usb_submit_urb(urb, SLAB_ATOMIC); status = usb_submit_urb(urb, GFP_ATOMIC);
if (status) if (status)
err("can't resubmit intr, %s-%s/interfacekit0, status %d", err("can't resubmit intr, %s-%s/interfacekit0, status %d",
kit->udev->bus->bus_name, kit->udev->bus->bus_name,
@ -568,7 +568,7 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic
kit->dev_no = -1; kit->dev_no = -1;
kit->ifkit = ifkit; kit->ifkit = ifkit;
kit->data = usb_buffer_alloc(dev, URB_INT_SIZE, SLAB_ATOMIC, &kit->data_dma); kit->data = usb_buffer_alloc(dev, URB_INT_SIZE, GFP_ATOMIC, &kit->data_dma);
if (!kit->data) if (!kit->data)
goto out; goto out;

4
drivers/usb/misc/phidgetmotorcontrol.c
View File

@ -151,7 +151,7 @@ static void motorcontrol_irq(struct urb *urb)
schedule_delayed_work(&mc->do_notify, 0); schedule_delayed_work(&mc->do_notify, 0);
resubmit: resubmit:
status = usb_submit_urb(urb, SLAB_ATOMIC); status = usb_submit_urb(urb, GFP_ATOMIC);
if (status) if (status)
dev_err(&mc->intf->dev, dev_err(&mc->intf->dev,
"can't resubmit intr, %s-%s/motorcontrol0, status %d", "can't resubmit intr, %s-%s/motorcontrol0, status %d",
@ -338,7 +338,7 @@ static int motorcontrol_probe(struct usb_interface *intf, const struct usb_devic
goto out; goto out;
mc->dev_no = -1; mc->dev_no = -1;
mc->data = usb_buffer_alloc(dev, URB_INT_SIZE, SLAB_ATOMIC, &mc->data_dma); mc->data = usb_buffer_alloc(dev, URB_INT_SIZE, GFP_ATOMIC, &mc->data_dma);
if (!mc->data) if (!mc->data)
goto out; goto out;

8
drivers/usb/misc/usbtest.c
View File

@ -819,7 +819,7 @@ error:
/* resubmit if we need to, else mark this as done */ /* resubmit if we need to, else mark this as done */
if ((status == 0) && (ctx->pending < ctx->count)) { if ((status == 0) && (ctx->pending < ctx->count)) {
if ((status = usb_submit_urb (urb, SLAB_ATOMIC)) != 0) { if ((status = usb_submit_urb (urb, GFP_ATOMIC)) != 0) {
dbg ("can't resubmit ctrl %02x.%02x, err %d", dbg ("can't resubmit ctrl %02x.%02x, err %d",
reqp->bRequestType, reqp->bRequest, status); reqp->bRequestType, reqp->bRequest, status);
urb->dev = NULL; urb->dev = NULL;
@ -999,7 +999,7 @@ test_ctrl_queue (struct usbtest_dev *dev, struct usbtest_param *param)
context.urb = urb; context.urb = urb;
spin_lock_irq (&context.lock); spin_lock_irq (&context.lock);
for (i = 0; i < param->sglen; i++) { for (i = 0; i < param->sglen; i++) {
context.status = usb_submit_urb (urb [i], SLAB_ATOMIC); context.status = usb_submit_urb (urb [i], GFP_ATOMIC);
if (context.status != 0) { if (context.status != 0) {
dbg ("can't submit urb[%d], status %d", dbg ("can't submit urb[%d], status %d",
i, context.status); i, context.status);
@ -1041,7 +1041,7 @@ static void unlink1_callback (struct urb *urb)
// we "know" -EPIPE (stall) never happens // we "know" -EPIPE (stall) never happens
if (!status) if (!status)
status = usb_submit_urb (urb, SLAB_ATOMIC); status = usb_submit_urb (urb, GFP_ATOMIC);
if (status) { if (status) {
urb->status = status; urb->status = status;
complete ((struct completion *) urb->context); complete ((struct completion *) urb->context);
@ -1481,7 +1481,7 @@ test_iso_queue (struct usbtest_dev *dev, struct usbtest_param *param,
spin_lock_irq (&context.lock); spin_lock_irq (&context.lock);
for (i = 0; i < param->sglen; i++) { for (i = 0; i < param->sglen; i++) {
++context.pending; ++context.pending;
status = usb_submit_urb (urbs [i], SLAB_ATOMIC); status = usb_submit_urb (urbs [i], GFP_ATOMIC);
if (status < 0) { if (status < 0) {
ERROR (dev, "submit iso[%d], error %d\n", i, status); ERROR (dev, "submit iso[%d], error %d\n", i, status);
if (i == 0) { if (i == 0) {

4
drivers/usb/mon/mon_text.c
View File

@ -147,7 +147,7 @@ static void mon_text_event(struct mon_reader_text *rp, struct urb *urb,
stamp = mon_get_timestamp(); stamp = mon_get_timestamp();
if (rp->nevents >= EVENT_MAX || if (rp->nevents >= EVENT_MAX ||
(ep = kmem_cache_alloc(rp->e_slab, SLAB_ATOMIC)) == NULL) { (ep = kmem_cache_alloc(rp->e_slab, GFP_ATOMIC)) == NULL) {
rp->r.m_bus->cnt_text_lost++; rp->r.m_bus->cnt_text_lost++;
return; return;
} }
@ -188,7 +188,7 @@ static void mon_text_error(void *data, struct urb *urb, int error)
struct mon_event_text *ep; struct mon_event_text *ep;
if (rp->nevents >= EVENT_MAX || if (rp->nevents >= EVENT_MAX ||
(ep = kmem_cache_alloc(rp->e_slab, SLAB_ATOMIC)) == NULL) { (ep = kmem_cache_alloc(rp->e_slab, GFP_ATOMIC)) == NULL) {
rp->r.m_bus->cnt_text_lost++; rp->r.m_bus->cnt_text_lost++;
return; return;
} }

2
drivers/usb/net/catc.c
View File

@ -345,7 +345,7 @@ static void catc_irq_done(struct urb *urb)
} }
} }
resubmit: resubmit:
status = usb_submit_urb (urb, SLAB_ATOMIC); status = usb_submit_urb (urb, GFP_ATOMIC);
if (status) if (status)
err ("can't resubmit intr, %s-%s, status %d", err ("can't resubmit intr, %s-%s, status %d",
catc->usbdev->bus->bus_name, catc->usbdev->bus->bus_name,

2
drivers/usb/net/net1080.c
View File

@ -383,7 +383,7 @@ static void nc_ensure_sync(struct usbnet *dev)
int status; int status;
/* Send a flush */ /* Send a flush */
urb = usb_alloc_urb(0, SLAB_ATOMIC); urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!urb) if (!urb)
return; return;

2
drivers/usb/net/pegasus.c
View File

@ -856,7 +856,7 @@ static void intr_callback(struct urb *urb)
pegasus->stats.rx_missed_errors += ((d[3] & 0x7f) << 8) | d[4]; 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) if (status == -ENODEV)
netif_device_detach(pegasus->net); netif_device_detach(pegasus->net);
if (status && netif_msg_timer(pegasus)) if (status && netif_msg_timer(pegasus))

2
drivers/usb/net/rtl8150.c
View File

@ -587,7 +587,7 @@ static void intr_callback(struct urb *urb)
} }
resubmit: resubmit:
status = usb_submit_urb (urb, SLAB_ATOMIC); status = usb_submit_urb (urb, GFP_ATOMIC);
if (status == -ENODEV) if (status == -ENODEV)
netif_device_detach(dev->netdev); netif_device_detach(dev->netdev);
else if (status) else if (status)

2
drivers/usb/serial/mos7720.c
View File

@ -363,7 +363,7 @@ static int mos7720_open(struct usb_serial_port *port, struct file * filp)
/* Initialising the write urb pool */ /* Initialising the write urb pool */
for (j = 0; j < NUM_URBS; ++j) { for (j = 0; j < NUM_URBS; ++j) {
urb = usb_alloc_urb(0,SLAB_ATOMIC); urb = usb_alloc_urb(0,GFP_ATOMIC);
mos7720_port->write_urb_pool[j] = urb; mos7720_port->write_urb_pool[j] = urb;
if (urb == NULL) { if (urb == NULL) {

4
drivers/usb/serial/mos7840.c
View File

@ -826,7 +826,7 @@ static int mos7840_open(struct usb_serial_port *port, struct file *filp)
/* Initialising the write urb pool */ /* Initialising the write urb pool */
for (j = 0; j < NUM_URBS; ++j) { for (j = 0; j < NUM_URBS; ++j) {
urb = usb_alloc_urb(0, SLAB_ATOMIC); urb = usb_alloc_urb(0, GFP_ATOMIC);
mos7840_port->write_urb_pool[j] = urb; mos7840_port->write_urb_pool[j] = urb;
if (urb == NULL) { if (urb == NULL) {
@ -2786,7 +2786,7 @@ static int mos7840_startup(struct usb_serial *serial)
i + 1, status); i + 1, status);
} }
mos7840_port->control_urb = usb_alloc_urb(0, SLAB_ATOMIC); mos7840_port->control_urb = usb_alloc_urb(0, GFP_ATOMIC);
mos7840_port->ctrl_buf = kmalloc(16, GFP_KERNEL); mos7840_port->ctrl_buf = kmalloc(16, GFP_KERNEL);
} }

4
drivers/usb/storage/onetouch.c
View File

@ -76,7 +76,7 @@ static void usb_onetouch_irq(struct urb *urb)
input_sync(dev); input_sync(dev);
resubmit: resubmit:
status = usb_submit_urb (urb, SLAB_ATOMIC); status = usb_submit_urb (urb, GFP_ATOMIC);
if (status) if (status)
err ("can't resubmit intr, %s-%s/input0, status %d", err ("can't resubmit intr, %s-%s/input0, status %d",
onetouch->udev->bus->bus_name, onetouch->udev->bus->bus_name,
@ -154,7 +154,7 @@ int onetouch_connect_input(struct us_data *ss)
goto fail1; goto fail1;
onetouch->data = usb_buffer_alloc(udev, ONETOUCH_PKT_LEN, onetouch->data = usb_buffer_alloc(udev, ONETOUCH_PKT_LEN,
SLAB_ATOMIC, &onetouch->data_dma); GFP_ATOMIC, &onetouch->data_dma);
if (!onetouch->data) if (!onetouch->data)
goto fail1; goto fail1;

1
include/linux/slab.h
View File

@ -19,7 +19,6 @@ typedef struct kmem_cache kmem_cache_t;
#include <asm/cache.h> /* kmalloc_sizes.h needs L1_CACHE_BYTES */ #include <asm/cache.h> /* kmalloc_sizes.h needs L1_CACHE_BYTES */
/* flags for kmem_cache_alloc() */ /* flags for kmem_cache_alloc() */
#define SLAB_ATOMIC GFP_ATOMIC
#define SLAB_KERNEL GFP_KERNEL #define SLAB_KERNEL GFP_KERNEL
#define SLAB_DMA GFP_DMA #define SLAB_DMA GFP_DMA

2
include/net/request_sock.h
View File

@ -60,7 +60,7 @@ struct request_sock {
static inline struct request_sock *reqsk_alloc(const struct request_sock_ops *ops) static inline struct request_sock *reqsk_alloc(const struct request_sock_ops *ops)
{ {
struct request_sock *req = kmem_cache_alloc(ops->slab, SLAB_ATOMIC); struct request_sock *req = kmem_cache_alloc(ops->slab, GFP_ATOMIC);
if (req != NULL) if (req != NULL)
req->rsk_ops = ops; req->rsk_ops = ops;

2
net/core/dst.c
View File

@ -125,7 +125,7 @@ void * dst_alloc(struct dst_ops * ops)
if (ops->gc()) if (ops->gc())
return NULL; return NULL;
} }
dst = kmem_cache_alloc(ops->kmem_cachep, SLAB_ATOMIC); dst = kmem_cache_alloc(ops->kmem_cachep, GFP_ATOMIC);
if (!dst) if (!dst)
return NULL; return NULL;
memset(dst, 0, ops->entry_size); memset(dst, 0, ops->entry_size);

2
net/core/flow.c
View File

@ -211,7 +211,7 @@ void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir,
if (flow_count(cpu) > flow_hwm) if (flow_count(cpu) > flow_hwm)
flow_cache_shrink(cpu); flow_cache_shrink(cpu);
fle = kmem_cache_alloc(flow_cachep, SLAB_ATOMIC); fle = kmem_cache_alloc(flow_cachep, GFP_ATOMIC);
if (fle) { if (fle) {
fle->next = *head; fle->next = *head;
*head = fle; *head = fle;

2
net/core/neighbour.c
View File

@ -251,7 +251,7 @@ static struct neighbour *neigh_alloc(struct neigh_table *tbl)
goto out_entries; goto out_entries;
} }
n = kmem_cache_alloc(tbl->kmem_cachep, SLAB_ATOMIC); n = kmem_cache_alloc(tbl->kmem_cachep, GFP_ATOMIC);
if (!n) if (!n)
goto out_entries; goto out_entries;

6
net/dccp/ccids/ccid3.c
View File

@ -295,7 +295,7 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
new_packet = dccp_tx_hist_head(&hctx->ccid3hctx_hist); new_packet = dccp_tx_hist_head(&hctx->ccid3hctx_hist);
if (new_packet == NULL || new_packet->dccphtx_sent) { if (new_packet == NULL || new_packet->dccphtx_sent) {
new_packet = dccp_tx_hist_entry_new(ccid3_tx_hist, new_packet = dccp_tx_hist_entry_new(ccid3_tx_hist,
SLAB_ATOMIC); GFP_ATOMIC);
if (unlikely(new_packet == NULL)) { if (unlikely(new_packet == NULL)) {
DCCP_WARN("%s, sk=%p, not enough mem to add to history," DCCP_WARN("%s, sk=%p, not enough mem to add to history,"
@ -889,7 +889,7 @@ static void ccid3_hc_rx_update_li(struct sock *sk, u64 seq_loss, u8 win_loss)
/* new loss event detected */ /* new loss event detected */
/* calculate last interval length */ /* calculate last interval length */
seq_temp = dccp_delta_seqno(head->dccplih_seqno, seq_loss); seq_temp = dccp_delta_seqno(head->dccplih_seqno, seq_loss);
entry = dccp_li_hist_entry_new(ccid3_li_hist, SLAB_ATOMIC); entry = dccp_li_hist_entry_new(ccid3_li_hist, GFP_ATOMIC);
if (entry == NULL) { if (entry == NULL) {
DCCP_BUG("out of memory - can not allocate entry"); DCCP_BUG("out of memory - can not allocate entry");
@ -1011,7 +1011,7 @@ static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb)
} }
packet = dccp_rx_hist_entry_new(ccid3_rx_hist, sk, opt_recv->dccpor_ndp, packet = dccp_rx_hist_entry_new(ccid3_rx_hist, sk, opt_recv->dccpor_ndp,
skb, SLAB_ATOMIC); skb, GFP_ATOMIC);
if (unlikely(packet == NULL)) { if (unlikely(packet == NULL)) {
DCCP_WARN("%s, sk=%p, Not enough mem to add rx packet " DCCP_WARN("%s, sk=%p, Not enough mem to add rx packet "
"to history, consider it lost!\n", dccp_role(sk), sk); "to history, consider it lost!\n", dccp_role(sk), sk);

2
net/dccp/ccids/lib/loss_interval.c
View File

@ -125,7 +125,7 @@ int dccp_li_hist_interval_new(struct dccp_li_hist *hist,
int i; int i;
for (i = 0; i < DCCP_LI_HIST_IVAL_F_LENGTH; i++) { for (i = 0; i < DCCP_LI_HIST_IVAL_F_LENGTH; i++) {
entry = dccp_li_hist_entry_new(hist, SLAB_ATOMIC); entry = dccp_li_hist_entry_new(hist, GFP_ATOMIC);
if (entry == NULL) { if (entry == NULL) {
dccp_li_hist_purge(hist, list); dccp_li_hist_purge(hist, list);
DCCP_BUG("loss interval list entry is NULL"); DCCP_BUG("loss interval list entry is NULL");

2
net/ipv4/inet_hashtables.c
View File

@ -31,7 +31,7 @@ struct inet_bind_bucket *inet_bind_bucket_create(kmem_cache_t *cachep,
struct inet_bind_hashbucket *head, struct inet_bind_hashbucket *head,
const unsigned short snum) const unsigned short snum)
{ {
struct inet_bind_bucket *tb = kmem_cache_alloc(cachep, SLAB_ATOMIC); struct inet_bind_bucket *tb = kmem_cache_alloc(cachep, GFP_ATOMIC);
if (tb != NULL) { if (tb != NULL) {
tb->port = snum; tb->port = snum;

2
net/ipv4/inet_timewait_sock.c
View File

@ -91,7 +91,7 @@ struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk, const int stat
{ {
struct inet_timewait_sock *tw = struct inet_timewait_sock *tw =
kmem_cache_alloc(sk->sk_prot_creator->twsk_prot->twsk_slab, kmem_cache_alloc(sk->sk_prot_creator->twsk_prot->twsk_slab,
SLAB_ATOMIC); GFP_ATOMIC);
if (tw != NULL) { if (tw != NULL) {
const struct inet_sock *inet = inet_sk(sk); const struct inet_sock *inet = inet_sk(sk);

2
net/ipv6/ip6_fib.c
View File

@ -150,7 +150,7 @@ static __inline__ struct fib6_node * node_alloc(void)
{ {
struct fib6_node *fn; struct fib6_node *fn;
if ((fn = kmem_cache_alloc(fib6_node_kmem, SLAB_ATOMIC)) != NULL) if ((fn = kmem_cache_alloc(fib6_node_kmem, GFP_ATOMIC)) != NULL)
memset(fn, 0, sizeof(struct fib6_node)); memset(fn, 0, sizeof(struct fib6_node));
return fn; return fn;

2
net/ipv6/xfrm6_tunnel.c
View File

@ -180,7 +180,7 @@ try_next_2:;
spi = 0; spi = 0;
goto out; goto out;
alloc_spi: alloc_spi:
x6spi = kmem_cache_alloc(xfrm6_tunnel_spi_kmem, SLAB_ATOMIC); x6spi = kmem_cache_alloc(xfrm6_tunnel_spi_kmem, GFP_ATOMIC);
if (!x6spi) if (!x6spi)
goto out; goto out;

2
net/sctp/sm_make_chunk.c
View File

@ -979,7 +979,7 @@ struct sctp_chunk *sctp_chunkify(struct sk_buff *skb,
{ {
struct sctp_chunk *retval; struct sctp_chunk *retval;
retval = kmem_cache_alloc(sctp_chunk_cachep, SLAB_ATOMIC); retval = kmem_cache_alloc(sctp_chunk_cachep, GFP_ATOMIC);
if (!retval) if (!retval)
goto nodata; goto nodata;

2
net/sctp/socket.c
View File

@ -4989,7 +4989,7 @@ static struct sctp_bind_bucket *sctp_bucket_create(
{ {
struct sctp_bind_bucket *pp; struct sctp_bind_bucket *pp;
pp = kmem_cache_alloc(sctp_bucket_cachep, SLAB_ATOMIC); pp = kmem_cache_alloc(sctp_bucket_cachep, GFP_ATOMIC);
SCTP_DBG_OBJCNT_INC(bind_bucket); SCTP_DBG_OBJCNT_INC(bind_bucket);
if (pp) { if (pp) {
pp->port = snum; pp->port = snum;

2
net/xfrm/xfrm_input.c
View File

@ -27,7 +27,7 @@ struct sec_path *secpath_dup(struct sec_path *src)
{ {
struct sec_path *sp; struct sec_path *sp;
sp = kmem_cache_alloc(secpath_cachep, SLAB_ATOMIC); sp = kmem_cache_alloc(secpath_cachep, GFP_ATOMIC);
if (!sp) if (!sp)
return NULL; return NULL;

2
security/selinux/avc.c
View File

@ -332,7 +332,7 @@ static struct avc_node *avc_alloc_node(void)
{ {
struct avc_node *node; struct avc_node *node;
node = kmem_cache_alloc(avc_node_cachep, SLAB_ATOMIC); node = kmem_cache_alloc(avc_node_cachep, GFP_ATOMIC);
if (!node) if (!node)
goto out; goto out;