Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54e6ecb2 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] slab: remove SLAB_ATOMIC 



SLAB_ATOMIC is an alias of GFP_ATOMIC

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f7267c0c

drivers/atm/he.c

+1 −1
Original line number Diff line number Diff line
@@ -1724,7 +1724,7 @@ __alloc_tpd(struct he_dev *he_dev) 
	struct he_tpd *tpd;

	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)

		return NULL;

drivers/base/dmapool.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ dma_pool_alloc (struct dma_pool *pool, gfp_t mem_flags, dma_addr_t *handle) 
			}

		}

	}

	if (!(page = pool_alloc_page (pool, SLAB_ATOMIC))) {

	if (!(page = pool_alloc_page (pool, GFP_ATOMIC))) {

		if (mem_flags & __GFP_WAIT) {

			DECLARE_WAITQUEUE (wait, current);

drivers/block/DAC960.c

+2 −2
Original line number Diff line number Diff line
@@ -324,13 +324,13 @@ static boolean DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller) 
      Command->Next = Controller->FreeCommands;

      Controller->FreeCommands = Command;

      Controller->Commands[CommandIdentifier-1] = Command;

      ScatterGatherCPU = pci_pool_alloc(ScatterGatherPool, SLAB_ATOMIC,

      ScatterGatherCPU = pci_pool_alloc(ScatterGatherPool, GFP_ATOMIC,

							&ScatterGatherDMA);

      if (ScatterGatherCPU == NULL)

	  return DAC960_Failure(Controller, "AUXILIARY STRUCTURE CREATION");



      if (RequestSensePool != NULL) {

  	  RequestSenseCPU = pci_pool_alloc(RequestSensePool, SLAB_ATOMIC,

  	  RequestSenseCPU = pci_pool_alloc(RequestSensePool, GFP_ATOMIC,

						&RequestSenseDMA);

  	  if (RequestSenseCPU == NULL) {

                pci_pool_free(ScatterGatherPool, ScatterGatherCPU,

drivers/char/watchdog/pcwd_usb.c

+1 −1
Original line number Diff line number Diff line
@@ -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);



	/* 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");

		goto error;

	}

drivers/ieee1394/raw1394.c

+15 −15
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static void host_reset(struct hpsb_host *host) 
	if (hi != NULL) {

		list_for_each_entry(fi, &hi->file_info_list, list) {

			if (fi->notification == RAW1394_NOTIFY_ON) {

				req = __alloc_pending_request(SLAB_ATOMIC);

				req = __alloc_pending_request(GFP_ATOMIC);



				if (req != NULL) {

					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)))

				continue;



			req = __alloc_pending_request(SLAB_ATOMIC);

			req = __alloc_pending_request(GFP_ATOMIC);

			if (!req)

				break;



			if (!ibs) {

				ibs = kmalloc(sizeof(*ibs) + length,

					      SLAB_ATOMIC);

					      GFP_ATOMIC);

				if (!ibs) {

					kfree(req);

					break;
@@ -367,13 +367,13 @@ static void fcp_request(struct hpsb_host *host, int nodeid, int direction, 
			if (!fi->fcp_buffer)

				continue;



			req = __alloc_pending_request(SLAB_ATOMIC);

			req = __alloc_pending_request(GFP_ATOMIC);

			if (!req)

				break;



			if (!ibs) {

				ibs = kmalloc(sizeof(*ibs) + length,

					      SLAB_ATOMIC);

					      GFP_ATOMIC);

				if (!ibs) {

					kfree(req);

					break;
@@ -593,7 +593,7 @@ static int state_initialized(struct file_info *fi, struct pending_request *req) 
	switch (req->req.type) {

	case RAW1394_REQ_LIST_CARDS:

		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) {

			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) {

		DBGMSG("arm_read -> entering notification-section");

		req = __alloc_pending_request(SLAB_ATOMIC);

		req = __alloc_pending_request(GFP_ATOMIC);

		if (!req) {

			DBGMSG("arm_read -> rcode_conflict_error");

			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_request_response);

		}

		req->data = kmalloc(size, SLAB_ATOMIC);

		req->data = kmalloc(size, GFP_ATOMIC);

		if (!(req->data)) {

			free_pending_request(req);

			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) {

		DBGMSG("arm_write -> entering notification-section");

		req = __alloc_pending_request(SLAB_ATOMIC);

		req = __alloc_pending_request(GFP_ATOMIC);

		if (!req) {

			DBGMSG("arm_write -> rcode_conflict_error");

			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) +

		    (length) * sizeof(byte_t) +

		    sizeof(struct arm_request_response);

		req->data = kmalloc(size, SLAB_ATOMIC);

		req->data = kmalloc(size, GFP_ATOMIC);

		if (!(req->data)) {

			free_pending_request(req);

			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) {

		byte_t *buf1, *buf2;

		DBGMSG("arm_lock -> entering notification-section");

		req = __alloc_pending_request(SLAB_ATOMIC);

		req = __alloc_pending_request(GFP_ATOMIC);

		if (!req) {

			DBGMSG("arm_lock -> rcode_conflict_error");

			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 */

		}

		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)) {

			free_pending_request(req);

			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) {

		byte_t *buf1, *buf2;

		DBGMSG("arm_lock64 -> entering notification-section");

		req = __alloc_pending_request(SLAB_ATOMIC);

		req = __alloc_pending_request(GFP_ATOMIC);

		if (!req) {

			spin_unlock_irqrestore(&host_info_lock, irqflags);

			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 */

		}

		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)) {

			free_pending_request(req);

			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 */

	if (!__rawiso_event_in_queue(fi)) {

		struct pending_request *req =

		    __alloc_pending_request(SLAB_ATOMIC);

		    __alloc_pending_request(GFP_ATOMIC);



		if (req) {

			req->file_info = fi;