Slab: Remove GFP_XX aliases from slab.h
Subsystems (71)
cover Slab: Remove GFP_XX aliases from slab.h
slab.h contains a series of definitions that are simply aliases for gfp_XX. This duplication makes it difficult to search for uses of f.e. GFP_ATOMIC. Strange mixtures of uses of __GFP_xx with SLAB_xx exist in some pieces of code.
This patchset removes all the aliases from slab.h and also removes all occurrences.
I have tried to order these by size so that it is possible to just take the first few of these patches should they be considered to be too complex.
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH 1/8 Get rid of SLAB_NO_GROW
Get rid of SLAB_NO_GROW
It is only used internally in the slab.
include/linux/slab.h +0 -2
@@ -26,8 +26,6 @@#define SLAB_LEVEL_MASK GFP_LEVEL_MASK -#define SLAB_NO_GROW __GFP_NO_GROW/* don't grow a cache */ -/* flags to pass to kmem_cache_create(). * The first 3 are only valid when the allocator as been build * SLAB_DEBUG_SUPPORT.
mm/slab.c +2 -2
@@ -2725,8 +2725,8 @@* Be lazy and only check for valid flags here, keeping it out of the * critical path in kmem_cache_alloc(). */ -BUG_ON (flags & ~(SLAB_DMA |SLAB_LEVEL_MASK |SLAB_NO_GROW )); -if (flags &SLAB_NO_GROW ) +BUG_ON (flags & ~(SLAB_DMA |SLAB_LEVEL_MASK | __GFP_NO_GROW)); +if (flags & __GFP_NO_GROW)return 0 ; ctor_flags =SLAB_CTOR_CONSTRUCTOR ;
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH 2/8 Get rid of SLAB_LEVEL_MASK
In reply to Christoph LameterGet rid of SLAB_LEVEL_MASK
SLAB_LEVEL_MASK is only used internally to the slab and is and alias of GFP_LEVEL_MASK.
include/linux/slab.h +0 -2
@@ -24,8 +24,6 @@#define SLAB_KERNEL GFP_KERNEL#define SLAB_DMA GFP_DMA -#define SLAB_LEVEL_MASK GFP_LEVEL_MASK -/* flags to pass to kmem_cache_create(). * The first 3 are only valid when the allocator as been build * SLAB_DEBUG_SUPPORT.
mm/slab.c +2 -2
@@ -2725,12 +2725,12 @@* Be lazy and only check for valid flags here, keeping it out of the * critical path in kmem_cache_alloc(). */ -BUG_ON (flags & ~(SLAB_DMA |SLAB_LEVEL_MASK | __GFP_NO_GROW)); +BUG_ON (flags & ~(SLAB_DMA |GFP_LEVEL_MASK | __GFP_NO_GROW));if (flags & __GFP_NO_GROW)return 0 ; ctor_flags =SLAB_CTOR_CONSTRUCTOR ; - local_flags = (flags &SLAB_LEVEL_MASK ); + local_flags = (flags &GFP_LEVEL_MASK );if (!(local_flags & __GFP_WAIT))/* * Not allowed to sleep. Need to tell a constructor about
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH 3/8 Get rid of SLAB_NOIO
In reply to Christoph LameterGet rid of SLAB_NOIO
SLAB_NOIO is an alias of GFP_NOIO with a single instance of use.
drivers/usb/storage/transport.c +1 -1
@@ -427,7 +427,7 @@US_DEBUGP ("%s: xfer %u bytes, %d entries\n" , __FUNCTION__, length, num_sg); result =usb_sg_init (&us->current_sg, us->pusb_dev, pipe,0 , - sg, num_sg, length,SLAB_NOIO ); + sg, num_sg, length,GFP_NOIO );if (result) {US_DEBUGP ("usb_sg_init returned %d\n" , result);return USB_STOR_XFER_ERROR ;
include/linux/slab.h +0 -1
@@ -18,7 +18,6 @@/* flags for kmem_cache_alloc() */ #define SLAB_NOFS GFP_NOFS -#define SLAB_NOIO GFP_NOIO#define SLAB_ATOMIC GFP_ATOMIC#define SLAB_USER GFP_USER#define SLAB_KERNEL GFP_KERNEL
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH 4/8 Get rid of SLAB_NOFS
In reply to Christoph LameterGet rid of SLAB_NOFS
SLAB_NOFS is an alias of GFP_NOFS.
fs/nfs/read.c +1 -1
@@ -46,7 +46,7 @@struct nfs_read_data *nfs_readdata_alloc (size_t len) {unsigned int pagecount = (len +PAGE_SIZE -1 ) >>PAGE_SHIFT ; -struct nfs_read_data *p =mempool_alloc (nfs_rdata_mempool,SLAB_NOFS ); +struct nfs_read_data *p =mempool_alloc (nfs_rdata_mempool,GFP_NOFS );if (p) {memset (p,0 ,sizeof (*p));
fs/nfs/write.c +2 -2
@@ -93,7 +93,7 @@struct nfs_write_data *nfs_commit_alloc (void ) { -struct nfs_write_data *p =mempool_alloc (nfs_commit_mempool,SLAB_NOFS ); +struct nfs_write_data *p =mempool_alloc (nfs_commit_mempool,GFP_NOFS );if (p) {memset (p,0 ,sizeof (*p));
@@ -112,7 +112,7 @@struct nfs_write_data *nfs_writedata_alloc (size_t len) {unsigned int pagecount = (len +PAGE_SIZE -1 ) >>PAGE_SHIFT ; -struct nfs_write_data *p =mempool_alloc (nfs_wdata_mempool,SLAB_NOFS ); +struct nfs_write_data *p =mempool_alloc (nfs_wdata_mempool,GFP_NOFS );if (p) {memset (p,0 ,sizeof (*p));
fs/cifs/misc.c +2 -2
@@ -153,7 +153,7 @@albeit slightly larger than necessary and maxbuffersize defaults to this and can not be bigger */ ret_buf = - (struct smb_hdr *)mempool_alloc (cifs_req_poolp,SLAB_KERNEL |SLAB_NOFS ); + (struct smb_hdr *)mempool_alloc (cifs_req_poolp,SLAB_KERNEL |GFP_NOFS );/* clear the first few header bytes */ /* for most paths, more is cleared in header_assemble */
@@ -192,7 +192,7 @@albeit slightly larger than necessary and maxbuffersize defaults to this and can not be bigger */ ret_buf = - (struct smb_hdr *)mempool_alloc (cifs_sm_req_poolp,SLAB_KERNEL |SLAB_NOFS ); + (struct smb_hdr *)mempool_alloc (cifs_sm_req_poolp,SLAB_KERNEL |GFP_NOFS );if (ret_buf) {/* No need to clear memory here, cleared in header assemble */ /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
fs/cifs/transport.c +1 -1
@@ -51,7 +51,7 @@ } temp = (struct mid_q_entry *)mempool_alloc (cifs_mid_poolp, -SLAB_KERNEL |SLAB_NOFS ); +SLAB_KERNEL |GFP_NOFS );if (temp ==NULL )return temp;else {
fs/ext3/super.c +1 -1
@@ -445,7 +445,7 @@ {struct ext3_inode_info *ei; - ei =kmem_cache_alloc (ext3_inode_cachep,SLAB_NOFS ); + ei =kmem_cache_alloc (ext3_inode_cachep,GFP_NOFS );if (!ei)return NULL ;#ifdef CONFIG_EXT3_FS_POSIX_ACL
fs/ext4/super.c +1 -1
@@ -495,7 +495,7 @@ {struct ext4_inode_info *ei; - ei =kmem_cache_alloc (ext4_inode_cachep,SLAB_NOFS ); + ei =kmem_cache_alloc (ext4_inode_cachep,GFP_NOFS );if (!ei)return NULL ;#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
fs/hpfs/super.c +1 -1
@@ -160,7 +160,7 @@static struct inode *hpfs_alloc_inode (struct super_block *sb) {struct hpfs_inode_info *ei; - ei = (struct hpfs_inode_info *)kmem_cache_alloc (hpfs_inode_cachep,SLAB_NOFS ); + ei = (struct hpfs_inode_info *)kmem_cache_alloc (hpfs_inode_cachep,GFP_NOFS );if (!ei)return NULL ; ei->vfs_inode.i_version =1 ;
fs/ntfs/attrib.c +1 -1
@@ -1272,7 +1272,7 @@ {ntfs_attr_search_ctx *ctx; - ctx =kmem_cache_alloc (ntfs_attr_ctx_cache,SLAB_NOFS ); + ctx =kmem_cache_alloc (ntfs_attr_ctx_cache,GFP_NOFS );if (ctx)ntfs_attr_init_search_ctx (ctx, ni, mrec);return ctx;
fs/ntfs/unistr.c +1 -1
@@ -266,7 +266,7 @@/* We do not trust outside sources. */ if (likely (ins)) { - ucs =kmem_cache_alloc (ntfs_name_cache,SLAB_NOFS ); + ucs =kmem_cache_alloc (ntfs_name_cache,GFP_NOFS );if (likely (ucs)) {for (i = o =0 ; i < ins_len; i += wc_len) { wc_len = nls->char2uni(ins + i, ins_len - i,
fs/ntfs/index.c +1 -1
@@ -38,7 +38,7 @@ {ntfs_index_context *ictx; - ictx =kmem_cache_alloc (ntfs_index_ctx_cache,SLAB_NOFS ); + ictx =kmem_cache_alloc (ntfs_index_ctx_cache,GFP_NOFS );if (ictx) *ictx = (ntfs_index_context ){ .idx_ni = idx_ni };return ictx;
fs/ntfs/inode.c +2 -2
@@ -324,7 +324,7 @@ntfs_inode *ni;ntfs_debug ("Entering." ); - ni =kmem_cache_alloc (ntfs_big_inode_cache,SLAB_NOFS ); + ni =kmem_cache_alloc (ntfs_big_inode_cache,GFP_NOFS );if (likely (ni !=NULL )) { ni->state =0 ;return VFS_I (ni);
@@ -349,7 +349,7 @@ntfs_inode *ni;ntfs_debug ("Entering." ); - ni =kmem_cache_alloc (ntfs_inode_cache,SLAB_NOFS ); + ni =kmem_cache_alloc (ntfs_inode_cache,GFP_NOFS );if (likely (ni !=NULL )) { ni->state =0 ;return ni;
fs/ocfs2/dlm/dlmfs.c +1 -1
@@ -276,7 +276,7 @@ {struct dlmfs_inode_private *ip; - ip =kmem_cache_alloc (dlmfs_inode_cache,SLAB_NOFS ); + ip =kmem_cache_alloc (dlmfs_inode_cache,GFP_NOFS );if (!ip)return NULL ;
fs/ocfs2/super.c +1 -1
@@ -303,7 +303,7 @@ {struct ocfs2_inode_info *oi; - oi =kmem_cache_alloc (ocfs2_inode_cachep,SLAB_NOFS ); + oi =kmem_cache_alloc (ocfs2_inode_cachep,GFP_NOFS );if (!oi)return NULL ;
fs/dquot.c +1 -1
@@ -600,7 +600,7 @@ {struct dquot *dquot; - dquot =kmem_cache_alloc (dquot_cachep,SLAB_NOFS ); + dquot =kmem_cache_alloc (dquot_cachep,GFP_NOFS );if (!dquot)return NODQUOT ;
include/linux/slab.h +0 -1
@@ -17,7 +17,6 @@#include <linux/types.h> /* flags for kmem_cache_alloc() */ -#define SLAB_NOFS GFP_NOFS#define SLAB_ATOMIC GFP_ATOMIC#define SLAB_USER GFP_USER#define SLAB_KERNEL GFP_KERNEL
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH 5/8 Get rid of SLAB_USER
In reply to Christoph LameterGet rid of SLAB_USER
SLAB_USER is an alias of GFP_USER
fs/ecryptfs/crypto.c +2 -2
@@ -1333,7 +1333,7 @@ goto out; }/* Released in this function */ - page_virt =kmem_cache_alloc (ecryptfs_header_cache_0,SLAB_USER ); + page_virt =kmem_cache_alloc (ecryptfs_header_cache_0,GFP_USER );if (!page_virt) {ecryptfs_printk (KERN_ERR ,"Out of memory\n" ); rc = -ENOMEM ;
@@ -1492,7 +1492,7 @@ &ecryptfs_inode_to_private (ecryptfs_dentry->d_inode)->crypt_stat;/* Read the first page from the underlying file */ - page_virt =kmem_cache_alloc (ecryptfs_header_cache_1,SLAB_USER ); + page_virt =kmem_cache_alloc (ecryptfs_header_cache_1,GFP_USER );if (!page_virt) { rc = -ENOMEM ;ecryptfs_printk (KERN_ERR ,"Unable to allocate page_virt\n" );
fs/ecryptfs/inode.c +1 -1
@@ -363,7 +363,7 @@/* Released in this function */ page_virt = (char *)kmem_cache_alloc (ecryptfs_header_cache_2, -SLAB_USER ); +GFP_USER );if (!page_virt) { rc = -ENOMEM ; ecryptfs_printk(KERN_ERR,
include/linux/slab.h +0 -1
@@ -18,7 +18,6 @@/* flags for kmem_cache_alloc() */ #define SLAB_ATOMIC GFP_ATOMIC -#define SLAB_USER GFP_USER#define SLAB_KERNEL GFP_KERNEL#define SLAB_DMA GFP_DMA
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH 6/8 Get rid of SLAB_ATOMIC
In reply to Christoph LameterGet rid of SLAB_ATOMIC
SLAB_ATOMIC is an alias of GFP_ATOMIC
drivers/atm/he.c +1 -1
@@ -1724,7 +1724,7 @@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/usb/mon/mon_text.c +2 -2
@@ -147,7 +147,7 @@ stamp =mon_get_timestamp ();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++;return ; }
@@ -188,7 +188,7 @@struct mon_event_text *ep;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++;return ; }
drivers/usb/net/catc.c +1 -1
@@ -345,7 +345,7 @@ } } 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,
drivers/usb/net/net1080.c +1 -1
@@ -383,7 +383,7 @@int status;/* Send a flush */ - urb =usb_alloc_urb (0 ,SLAB_ATOMIC ); + urb =usb_alloc_urb (0 ,GFP_ATOMIC );if (!urb)return ;
drivers/usb/net/pegasus.c +1 -1
@@ -855,7 +855,7 @@ 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))
drivers/usb/net/rtl8150.c +1 -1
@@ -587,7 +587,7 @@ } 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)
drivers/usb/core/hub.c +1 -1
@@ -459,7 +459,7 @@* 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. */ -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" );/* FIXME recover somehow ... RESET_TT? */ return ;
drivers/usb/core/message.c +1 -1
@@ -488,7 +488,7 @@int retval; 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; * we handshake using io->status.
drivers/usb/host/ehci-dbg.c +1 -1
@@ -492,7 +492,7 @@unsigned i;__le32 tag; -if (!(seen =kmalloc (DBG_SCHED_LIMIT *sizeof *seen,SLAB_ATOMIC ))) +if (!(seen =kmalloc (DBG_SCHED_LIMIT *sizeof *seen,GFP_ATOMIC )))return 0 ; seen_count =0 ;
drivers/usb/host/uhci-q.c +1 -1
@@ -498,7 +498,7 @@ {struct urb_priv *urbp; - urbp =kmem_cache_alloc (uhci_up_cachep,SLAB_ATOMIC ); + urbp =kmem_cache_alloc (uhci_up_cachep,GFP_ATOMIC );if (!urbp)return NULL ;
drivers/usb/host/hc_crisv10.c +5 -5
@@ -188,7 +188,7 @@#define CHECK_ALIGN (x) if (((__u32)(x)) & 0x00000003) \ {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)/* Most helpful debugging aid */
@@ -1743,7 +1743,7 @@ *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 );INIT_WORK (&comp_data->usb_bh, etrax_usb_isoc_descr_interrupt_bottom_half, comp_data);
@@ -3010,7 +3010,7 @@if (!urb->iso_frame_desc[i].length)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 );if (urb->iso_frame_desc[i].length >0 ) {
@@ -3063,7 +3063,7 @@if (TxIsocEPList[epid].sub ==0 ) {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 ); next_sb_desc->command = (IO_STATE(USB_SB_command, tt, in) |
@@ -3317,7 +3317,7 @@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 );
drivers/usb/host/ohci-dbg.c +1 -1
@@ -505,7 +505,7 @@char *next;unsigned i; -if (!(seen =kmalloc (DBG_SCHED_LIMIT *sizeof *seen,SLAB_ATOMIC ))) +if (!(seen =kmalloc (DBG_SCHED_LIMIT *sizeof *seen,GFP_ATOMIC )))return 0 ; seen_count =0 ;
drivers/usb/misc/phidgetkit.c +2 -2
@@ -377,7 +377,7 @@schedule_work (&kit->do_notify); resubmit: - status =usb_submit_urb (urb,SLAB_ATOMIC ); + status =usb_submit_urb (urb,GFP_ATOMIC );if (status) err("can't resubmit intr, %s-%s/interfacekit0, status %d", kit->udev->bus->bus_name,
@@ -565,7 +565,7 @@ kit->dev_no =-1 ; 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) goto out;
drivers/usb/misc/usbtest.c +4 -4
@@ -819,7 +819,7 @@/* resubmit if we need to, else mark this as done */ 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" , reqp->bRequestType, reqp->bRequest, status); urb->dev =NULL ;
@@ -999,7 +999,7 @@ context.urb = urb;spin_lock_irq (&context.lock);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 ) {dbg ("can't submit urb[%d], status %d" , i, context.status);
@@ -1041,7 +1041,7 @@// we "know" -EPIPE (stall) never happens if (!status) - status =usb_submit_urb (urb,SLAB_ATOMIC ); + status =usb_submit_urb (urb,GFP_ATOMIC );if (status) { urb->status = status;complete ((struct completion *) urb->context);
@@ -1481,7 +1481,7 @@spin_lock_irq (&context.lock);for (i =0 ; i < param->sglen; i++) { ++context.pending; - status =usb_submit_urb (urbs [i],SLAB_ATOMIC ); + status =usb_submit_urb (urbs [i],GFP_ATOMIC );if (status <0 ) {ERROR (dev,"submit iso[%d], error %d\n" , i, status);if (i ==0 ) {
drivers/usb/misc/phidgetmotorcontrol.c +2 -2
@@ -151,7 +151,7 @@schedule_work (&mc->do_notify); resubmit: - status =usb_submit_urb (urb,SLAB_ATOMIC ); + status =usb_submit_urb (urb,GFP_ATOMIC );if (status) dev_err(&mc->intf->dev, "can't resubmit intr, %s-%s/motorcontrol0, status %d",
@@ -337,7 +337,7 @@ goto out; 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) goto out;
drivers/usb/input/yealink.c +3 -3
@@ -874,17 +874,17 @@/* allocate usb buffers */ 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 )return usb_cleanup (yld, -ENOMEM ); yld->ctl_data =usb_buffer_alloc (udev,USB_PKT_LEN , -SLAB_ATOMIC , &yld->ctl_dma); +GFP_ATOMIC , &yld->ctl_dma);if (!yld->ctl_data)return usb_cleanup (yld, -ENOMEM ); 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 )return usb_cleanup (yld, -ENOMEM );
drivers/usb/input/powermate.c +2 -2
@@ -277,12 +277,12 @@static int powermate_alloc_buffers (struct usb_device *udev,struct powermate_device *pm) { pm->data =usb_buffer_alloc (udev,POWERMATE_PAYLOAD_SIZE_MAX , -SLAB_ATOMIC , &pm->data_dma); +GFP_ATOMIC , &pm->data_dma);if (!pm->data)return -1 ; pm->configcr =usb_buffer_alloc (udev,sizeof (*(pm->configcr)), -SLAB_ATOMIC , &pm->configcr_dma); +GFP_ATOMIC , &pm->configcr_dma);if (!pm->configcr)return -1 ;
drivers/usb/input/mtouchusb.c +1 -1
@@ -164,7 +164,7 @@dbg ("%s - called" , __FUNCTION__); mtouch->data =usb_buffer_alloc (udev,MTOUCHUSB_REPORT_DATA_SIZE , -SLAB_ATOMIC , &mtouch->data_dma); +GFP_ATOMIC , &mtouch->data_dma);if (!mtouch->data)return -1 ;
drivers/usb/input/usbmouse.c +2 -2
@@ -86,7 +86,7 @@input_sync (dev); resubmit: - status =usb_submit_urb (urb,SLAB_ATOMIC ); + status =usb_submit_urb (urb,GFP_ATOMIC );if (status) err ("can't resubmit intr, %s-%s/input0, status %d", mouse->usbdev->bus->bus_name,
@@ -137,7 +137,7 @@if (!mouse || !input_dev) 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) goto fail1;
drivers/usb/input/ati_remote.c +3 -3
@@ -592,7 +592,7 @@ __FUNCTION__, urb->status); } - retval =usb_submit_urb (urb,SLAB_ATOMIC ); + retval =usb_submit_urb (urb,GFP_ATOMIC );if (retval)dev_err (&ati_remote->interface->dev,"%s: usb_submit_urb()=%d\n" , __FUNCTION__, retval);
@@ -604,12 +604,12 @@static int ati_remote_alloc_buffers (struct usb_device *udev,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);if (!ati_remote->inbuf)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);if (!ati_remote->outbuf)return -1 ;
drivers/usb/input/aiptek.c +1 -1
@@ -1988,7 +1988,7 @@ goto fail1; aiptek->data =usb_buffer_alloc (usbdev,AIPTEK_PACKET_LENGTH , -SLAB_ATOMIC , &aiptek->data_dma); +GFP_ATOMIC , &aiptek->data_dma);if (!aiptek->data) goto fail1;
drivers/usb/input/xpad.c +1 -1
@@ -325,7 +325,7 @@ goto fail1; xpad->idata =usb_buffer_alloc (udev,XPAD_PKT_LEN , -SLAB_ATOMIC , &xpad->idata_dma); +GFP_ATOMIC , &xpad->idata_dma);if (!xpad->idata) goto fail1;
drivers/usb/input/usbkbd.c +4 -4
@@ -122,7 +122,7 @@memcpy (kbd->old, kbd->new,8 ); resubmit: - i =usb_submit_urb (urb,SLAB_ATOMIC ); + i =usb_submit_urb (urb,GFP_ATOMIC );if (i) err ("can't resubmit intr, %s-%s/input0, status %d", kbd->usbdev->bus->bus_name,
@@ -196,11 +196,11 @@return -1 ;if (!(kbd->led =usb_alloc_urb (0 ,GFP_KERNEL )))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 ; -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 ; -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 0 ;
drivers/usb/input/keyspan_remote.c +1 -1
@@ -456,7 +456,7 @@ remote->in_endpoint = endpoint; 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) { retval = -ENOMEM ; goto fail1;
drivers/usb/input/hid-core.c +5 -5
@@ -1078,7 +1078,7 @@warn ("input irq status %d received" , urb->status); } - status =usb_submit_urb (urb,SLAB_ATOMIC ); + status =usb_submit_urb (urb,GFP_ATOMIC );if (status) {clear_bit (HID_IN_RUNNING , &hid->iofl);if (status != -EPERM ) {
@@ -1853,13 +1853,13 @@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 ; -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 ; -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 ; -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 0 ;
drivers/usb/input/touchkitusb.c +1 -1
@@ -248,7 +248,7 @@ struct touchkit_usb *touchkit) { touchkit->data =usb_buffer_alloc (udev,TOUCHKIT_REPORT_DATA_SIZE , -SLAB_ATOMIC , &touchkit->data_dma); +GFP_ATOMIC , &touchkit->data_dma);if (!touchkit->data)return -1 ;
drivers/usb/storage/onetouch.c +2 -2
@@ -76,7 +76,7 @@input_sync (dev); resubmit: - status =usb_submit_urb (urb,SLAB_ATOMIC ); + status =usb_submit_urb (urb,GFP_ATOMIC );if (status) err ("can't resubmit intr, %s-%s/input0, status %d", onetouch->udev->bus->bus_name,
@@ -154,7 +154,7 @@ goto fail1; onetouch->data =usb_buffer_alloc (udev,ONETOUCH_PKT_LEN , -SLAB_ATOMIC , &onetouch->data_dma); +GFP_ATOMIC , &onetouch->data_dma);if (!onetouch->data) goto fail1;
drivers/usb/serial/mos7720.c +1 -1
@@ -363,7 +363,7 @@/* Initialising the write urb pool */ 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;if (urb ==NULL ) {
drivers/usb/serial/mos7840.c +2 -2
@@ -826,7 +826,7 @@/* Initialising the write urb pool */ 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;if (urb ==NULL ) {
@@ -2787,7 +2787,7 @@ 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 ); }
drivers/base/dmapool.c +1 -1
@@ -297,7 +297,7 @@ } } } -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/char/watchdog/pcwd_usb.c +1 -1
@@ -634,7 +634,7 @@ 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/isdn/gigaset/usb-gigaset.c +3 -3
@@ -410,7 +410,7 @@if (resubmit) {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);if (r) dev_err(cs->dev, "error %d when resubmitting urb.\n",
@@ -486,7 +486,7 @@atomic_set (&ucs->busy,1 );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);if (status) {
@@ -664,7 +664,7 @@ ucs->bulk_out_endpointAddr & 0x0f), ucs->bulk_out_buffer, count, 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 { ret = -ENODEV ; }
drivers/isdn/gigaset/bas-gigaset.c +10 -10
@@ -572,7 +572,7 @@ ucs->rcvbuf, ucs->rcvbuf_size, 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 );dev_err (cs->dev,"could not submit HD_READ_ATMESSAGE: %s\n" ,get_usb_rcmsg (ret));
@@ -747,7 +747,7 @@check_pending (ucs); resubmit: - rc =usb_submit_urb (urb,SLAB_ATOMIC ); + rc =usb_submit_urb (urb,GFP_ATOMIC );if (unlikely (rc !=0 && rc != -ENODEV )) {dev_err (cs->dev,"could not resubmit interrupt URB: %s\n" ,get_usb_rcmsg (rc));
@@ -807,7 +807,7 @@ urb->number_of_packets =BAS_NUMFRAMES ;gig_dbg (DEBUG_ISO ,"%s: isoc read overrun/resubmit" , __func__); - rc =usb_submit_urb (urb,SLAB_ATOMIC ); + rc =usb_submit_urb (urb,GFP_ATOMIC );if (unlikely (rc !=0 && rc != -ENODEV )) {dev_err (bcs->cs->dev, "could not resubmit isochronous read "
@@ -900,7 +900,7 @@ }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; }
@@ -935,7 +935,7 @@/* submit two URBs, keep third one */ for (k =0 ; k <2 ; ++k) {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 ) goto error; }
@@ -1042,7 +1042,7 @@return 0 ;/* no data to send */ urb->number_of_packets = nframe; - rc =usb_submit_urb (urb,SLAB_ATOMIC ); + rc =usb_submit_urb (urb,GFP_ATOMIC );if (unlikely (rc)) {if (rc == -ENODEV )/* device removed - give up silently */
@@ -1341,7 +1341,7 @@ urb->dev = bcs->cs->hw.bas->udev; urb->transfer_flags =URB_ISO_ASAP ; 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 )) { dev_err(cs->dev, "could not resubmit isochronous read URB: %s\n",
@@ -1458,7 +1458,7 @@ ucs->retry_ctrl);/* urb->dev is clobbered by USB subsystem */ urb->dev = ucs->udev; - rc =usb_submit_urb (urb,SLAB_ATOMIC ); + rc =usb_submit_urb (urb,GFP_ATOMIC );if (unlikely (rc)) { dev_err(&ucs->interface->dev, "could not resubmit request 0x%02x: %s\n",
@@ -1517,7 +1517,7 @@ (unsigned char *) &ucs->dr_ctrl,NULL ,0 , write_ctrl_callback, ucs); 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)) {dev_err (bcs->cs->dev,"could not submit request 0x%02x: %s\n" , req,get_usb_rcmsg (ret));
@@ -1763,7 +1763,7 @@usb_sndctrlpipe (ucs->udev,0 ), (unsigned char *) &ucs->dr_cmd_out, buf, len, 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)) {update_basstate (ucs,0 ,BS_ATWRPEND ); dev_err(cs->dev, "could not submit HD_WRITE_ATMESSAGE: %s\n",
drivers/s390/scsi/zfcp_fsf.c +1 -1
@@ -109,7 +109,7 @@ ptr =kmalloc (size,GFP_ATOMIC ); else ptr =kmem_cache_alloc (zfcp_data.fsf_req_qtcb_cache, -SLAB_ATOMIC ); +GFP_ATOMIC ); }if (unlikely (!ptr))
drivers/infiniband/hw/amso1100/c2_vq.c +1 -1
@@ -164,7 +164,7 @@*/ 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 ); }/*
drivers/infiniband/hw/mthca/mthca_av.c +1 -1
@@ -189,7 +189,7 @@ on_hca_fail:if (ah->type ==MTHCA_AH_PCI_POOL ) { ah->av =pci_pool_alloc (dev->av_table.pool, -SLAB_ATOMIC , &ah->avdma); +GFP_ATOMIC , &ah->avdma);if (!ah->av)return -ENOMEM ;
drivers/block/DAC960.c +2 -2
@@ -324,13 +324,13 @@ 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/media/dvb/ttusb-dec/ttusb_dec.c +1 -1
@@ -1251,7 +1251,7 @@return -ENOMEM ; } 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) {return -ENOMEM ; }
drivers/media/dvb/dvb-usb/usb-urb.c +1 -1
@@ -116,7 +116,7 @@for (stream->buf_num =0 ; stream->buf_num < num; stream->buf_num++) {deb_mem ("allocating buffer %d\n" ,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 ) {deb_mem ("not enough memory for urb-buffer allocation.\n" );usb_free_stream_buffers (stream);
drivers/ieee1394/raw1394.c +15 -15
@@ -274,7 +274,7 @@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;
@@ -321,13 +321,13 @@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 ;
@@ -382,13 +382,13 @@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 ;
@@ -608,7 +608,7 @@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;
@@ -1060,7 +1060,7 @@ }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);
@@ -1079,7 +1079,7 @@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" );
@@ -1213,7 +1213,7 @@ }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);
@@ -1224,7 +1224,7 @@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" );
@@ -1415,7 +1415,7 @@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);
@@ -1423,7 +1423,7 @@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" );
@@ -1643,7 +1643,7 @@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" );
@@ -1651,7 +1651,7 @@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);
@@ -2460,7 +2460,7 @@/* 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;
include/net/request_sock.h +1 -1
@@ -60,7 +60,7 @@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 ) req->rsk_ops = ops;
include/linux/slab.h +0 -1
@@ -17,7 +17,6 @@#include <linux/types.h> /* flags for kmem_cache_alloc() */ -#define SLAB_ATOMIC GFP_ATOMIC#define SLAB_KERNEL GFP_KERNEL#define SLAB_DMA GFP_DMA
net/dccp/ccids/lib/loss_interval.c +1 -1
@@ -125,7 +125,7 @@int 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 ) {dccp_li_hist_purge (hist, list);DCCP_BUG ("loss interval list entry is NULL" );
net/dccp/ccids/ccid3.c +3 -3
@@ -277,7 +277,7 @@ new_packet =dccp_tx_hist_head (&hctx->ccid3hctx_hist);if (new_packet ==NULL || new_packet->dccphtx_sent) { new_packet =dccp_tx_hist_entry_new (ccid3_tx_hist, -SLAB_ATOMIC ); +GFP_ATOMIC ); rc = -ENOBUFS ;if (unlikely (new_packet ==NULL )) {
@@ -887,7 +887,7 @@/* new loss event detected */ /* calculate last interval length */ 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 ) {DCCP_BUG ("out of memory - can not allocate entry" );
@@ -1009,7 +1009,7 @@ } packet =dccp_rx_hist_entry_new (ccid3_rx_hist, sk, opt_recv->dccpor_ndp, - skb,SLAB_ATOMIC ); + skb,GFP_ATOMIC );if (unlikely (packet ==NULL )) {DCCP_WARN ("%s, sk=%p, Not enough mem to add rx packet " "to history, consider it lost!\n" ,dccp_role (sk), sk);
net/core/dst.c +1 -1
@@ -132,7 +132,7 @@if (ops->gc ())return NULL ; } - dst =kmem_cache_alloc (ops->kmem_cachep,SLAB_ATOMIC ); + dst =kmem_cache_alloc (ops->kmem_cachep,GFP_ATOMIC );if (!dst)return NULL ;memset (dst,0 , ops->entry_size);
net/core/flow.c +1 -1
@@ -211,7 +211,7 @@if (flow_count (cpu) > flow_hwm)flow_cache_shrink (cpu); - fle =kmem_cache_alloc (flow_cachep,SLAB_ATOMIC ); + fle =kmem_cache_alloc (flow_cachep,GFP_ATOMIC );if (fle) { fle->next = *head; *head = fle;
net/core/neighbour.c +1 -1
@@ -251,7 +251,7 @@ goto out_entries; } - n =kmem_cache_alloc (tbl->kmem_cachep,SLAB_ATOMIC ); + n =kmem_cache_alloc (tbl->kmem_cachep,GFP_ATOMIC );if (!n) goto out_entries;
net/ipv4/inet_timewait_sock.c +1 -1
@@ -91,7 +91,7 @@ {struct inet_timewait_sock *tw =kmem_cache_alloc (sk->sk_prot_creator->twsk_prot->twsk_slab, -SLAB_ATOMIC ); +GFP_ATOMIC );if (tw !=NULL ) {const struct inet_sock *inet =inet_sk (sk);
net/ipv4/inet_hashtables.c +1 -1
@@ -31,7 +31,7 @@ struct inet_bind_hashbucket *head, 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 ) { tb->port = snum;
net/ipv6/ip6_fib.c +1 -1
@@ -150,7 +150,7 @@ {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 ));return fn;
net/ipv6/xfrm6_tunnel.c +1 -1
@@ -180,7 +180,7 @@ spi =0 ; goto out; alloc_spi: - x6spi =kmem_cache_alloc (xfrm6_tunnel_spi_kmem,SLAB_ATOMIC ); + x6spi =kmem_cache_alloc (xfrm6_tunnel_spi_kmem,GFP_ATOMIC );if (!x6spi) goto out;
net/sctp/sm_make_chunk.c +1 -1
@@ -979,7 +979,7 @@ {struct sctp_chunk *retval; - retval =kmem_cache_alloc (sctp_chunk_cachep,SLAB_ATOMIC ); + retval =kmem_cache_alloc (sctp_chunk_cachep,GFP_ATOMIC );if (!retval) goto nodata;
net/sctp/socket.c +1 -1
@@ -4989,7 +4989,7 @@ {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);if (pp) { pp->port = snum;
net/xfrm/xfrm_input.c +1 -1
@@ -27,7 +27,7 @@ {struct sec_path *sp; - sp =kmem_cache_alloc (secpath_cachep,SLAB_ATOMIC ); + sp =kmem_cache_alloc (secpath_cachep,GFP_ATOMIC );if (!sp)return NULL ;
security/selinux/avc.c +1 -1
@@ -332,7 +332,7 @@ {struct avc_node *node; - node =kmem_cache_alloc (avc_node_cachep,SLAB_ATOMIC ); + node =kmem_cache_alloc (avc_node_cachep,GFP_ATOMIC );if (!node) goto out;
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH 7/8 Get rid of SLAB_KERNEL
In reply to Christoph LameterGet rid of SLAB_KERNEL
SLAB_KERNEL is an alias of GFP_KERNEL.
arch/sh/kernel/vsyscall/vsyscall.c +1 -1
@@ -97,7 +97,7 @@ goto up_fail; } - vma =kmem_cache_zalloc (vm_area_cachep,SLAB_KERNEL ); + vma =kmem_cache_zalloc (vm_area_cachep,GFP_KERNEL );if (!vma) { ret = -ENOMEM ; goto up_fail;
arch/i386/kernel/sysenter.c +1 -1
@@ -136,7 +136,7 @@ goto up_fail; } - vma =kmem_cache_zalloc (vm_area_cachep,SLAB_KERNEL ); + vma =kmem_cache_zalloc (vm_area_cachep,GFP_KERNEL );if (!vma) { ret = -ENOMEM ; goto up_fail;
arch/ia64/mm/init.c +2 -2
@@ -156,7 +156,7 @@* the problem. When the process attempts to write to the register backing store * for the first time, it will get a SEGFAULT in this case. */ - vma =kmem_cache_alloc (vm_area_cachep,SLAB_KERNEL ); + vma =kmem_cache_alloc (vm_area_cachep,GFP_KERNEL );if (vma) {memset (vma,0 ,sizeof (*vma)); vma->vm_mm = current->mm;
@@ -175,7 +175,7 @@/* map NaT-page at address zero to speed up speculative dereferencing of NULL: */ if (!(current->personality &MMAP_PAGE_ZERO )) { - vma =kmem_cache_alloc (vm_area_cachep,SLAB_KERNEL ); + vma =kmem_cache_alloc (vm_area_cachep,GFP_KERNEL );if (vma) {memset (vma,0 ,sizeof (*vma)); vma->vm_mm = current->mm;
arch/ia64/ia32/binfmt_elf32.c +4 -4
@@ -91,7 +91,7 @@* it with privilege level 3 because the IVE uses non-privileged accesses to these * tables. IA-32 segmentation is used to protect against IA-32 accesses to them. */ - vma =kmem_cache_alloc (vm_area_cachep,SLAB_KERNEL ); + vma =kmem_cache_alloc (vm_area_cachep,GFP_KERNEL );if (vma) {memset (vma,0 ,sizeof (*vma)); vma->vm_mm = current->mm;
@@ -117,7 +117,7 @@* code is locked in specific gate page, which is pointed by pretcode * when setup_frame_ia32 */ - vma =kmem_cache_alloc (vm_area_cachep,SLAB_KERNEL ); + vma =kmem_cache_alloc (vm_area_cachep,GFP_KERNEL );if (vma) {memset (vma,0 ,sizeof (*vma)); vma->vm_mm = current->mm;
@@ -142,7 +142,7 @@* Install LDT as anonymous memory. This gives us all-zero segment descriptors * until a task modifies them via modify_ldt(). */ - vma =kmem_cache_alloc (vm_area_cachep,SLAB_KERNEL ); + vma =kmem_cache_alloc (vm_area_cachep,GFP_KERNEL );if (vma) {memset (vma,0 ,sizeof (*vma)); vma->vm_mm = current->mm;
@@ -214,7 +214,7 @@ bprm->loader += stack_base; bprm->exec += stack_base; - mpnt =kmem_cache_alloc (vm_area_cachep,SLAB_KERNEL ); + mpnt =kmem_cache_alloc (vm_area_cachep,GFP_KERNEL );if (!mpnt)return -ENOMEM ;
arch/ia64/kernel/perfmon.c +1 -1
@@ -2302,7 +2302,7 @@DPRINT (("smpl_buf @%p\n" , smpl_buf));/* allocate vma */ - vma =kmem_cache_alloc (vm_area_cachep,SLAB_KERNEL ); + vma =kmem_cache_alloc (vm_area_cachep,GFP_KERNEL );if (!vma) {DPRINT (("Cannot allocate vma\n" )); goto error_kmem;
arch/x86_64/ia32/ia32_binfmt.c +1 -1
@@ -349,7 +349,7 @@ bprm->loader += stack_base; bprm->exec += stack_base; - mpnt =kmem_cache_alloc (vm_area_cachep,SLAB_KERNEL ); + mpnt =kmem_cache_alloc (vm_area_cachep,GFP_KERNEL );if (!mpnt)return -ENOMEM ;
arch/x86_64/ia32/syscall32.c +1 -1
@@ -49,7 +49,7 @@struct mm_struct *mm = current->mm;int ret; - vma =kmem_cache_alloc (vm_area_cachep,SLAB_KERNEL ); + vma =kmem_cache_alloc (vm_area_cachep,GFP_KERNEL );if (!vma)return -ENOMEM ;
arch/powerpc/platforms/cell/spufs/inode.c +1 -1
@@ -48,7 +48,7 @@ {struct spufs_inode_info *ei; - ei =kmem_cache_alloc (spufs_inode_cache,SLAB_KERNEL ); + ei =kmem_cache_alloc (spufs_inode_cache,GFP_KERNEL );if (!ei)return NULL ;
arch/powerpc/kernel/vdso.c +1 -1
@@ -264,7 +264,7 @@/* Allocate a VMA structure and fill it up */ - vma =kmem_cache_zalloc (vm_area_cachep,SLAB_KERNEL ); + vma =kmem_cache_zalloc (vm_area_cachep,GFP_KERNEL );if (vma ==NULL ) { rc = -ENOMEM ; goto fail_mmapsem;
drivers/atm/he.c +2 -2
@@ -820,7 +820,7 @@void *cpuaddr;#ifdef USE_RBPS_POOL - cpuaddr =pci_pool_alloc (he_dev->rbps_pool,SLAB_KERNEL |SLAB_DMA , &dma_handle); + cpuaddr =pci_pool_alloc (he_dev->rbps_pool,GFP_KERNEL |SLAB_DMA , &dma_handle);if (cpuaddr ==NULL )return -ENOMEM ;#else
@@ -884,7 +884,7 @@void *cpuaddr;#ifdef USE_RBPL_POOL - cpuaddr =pci_pool_alloc (he_dev->rbpl_pool,SLAB_KERNEL |SLAB_DMA , &dma_handle); + cpuaddr =pci_pool_alloc (he_dev->rbpl_pool,GFP_KERNEL |SLAB_DMA , &dma_handle);if (cpuaddr ==NULL )return -ENOMEM ;#else
drivers/dma/ioatdma.c +2 -2
@@ -630,10 +630,10 @@dma_cookie_t cookie;int err =0 ; - src =kzalloc (sizeof (u8) *IOAT_TEST_SIZE ,SLAB_KERNEL ); + src =kzalloc (sizeof (u8) *IOAT_TEST_SIZE ,GFP_KERNEL );if (!src)return -ENOMEM ; - dest =kzalloc (sizeof (u8) *IOAT_TEST_SIZE ,SLAB_KERNEL ); + dest =kzalloc (sizeof (u8) *IOAT_TEST_SIZE ,GFP_KERNEL );if (!dest) {kfree (src);return -ENOMEM ;
drivers/mtd/devices/m25p80.c +1 -1
@@ -451,7 +451,7 @@return -ENODEV ; } - flash =kzalloc (sizeof *flash,SLAB_KERNEL ); + flash =kzalloc (sizeof *flash,GFP_KERNEL );if (!flash)return -ENOMEM ;
drivers/spi/spi.c +2 -2
@@ -360,7 +360,7 @@if (!dev)return NULL ; - master =kzalloc (size +sizeof *master,SLAB_KERNEL ); + master =kzalloc (size +sizeof *master,GFP_KERNEL );if (!master)return NULL ;
@@ -608,7 +608,7 @@ {int status; - buf =kmalloc (SPI_BUFSIZ ,SLAB_KERNEL ); + buf =kmalloc (SPI_BUFSIZ ,GFP_KERNEL );if (!buf) { status = -ENOMEM ; goto err0;
drivers/spi/spi_bitbang.c +1 -1
@@ -196,7 +196,7 @@return -EINVAL ;if (!cs) { - cs =kzalloc (sizeof *cs,SLAB_KERNEL ); + cs =kzalloc (sizeof *cs,GFP_KERNEL );if (!cs)return -ENOMEM ; spi->controller_state = cs;
drivers/usb/net/rndis_host.c +1 -1
@@ -469,7 +469,7 @@struct rndis_halt *halt;/* try to clear any rndis state/activity (no i/o from stack!) */ - halt =kcalloc (1 ,sizeof *halt,SLAB_KERNEL ); + halt =kcalloc (1 ,sizeof *halt,GFP_KERNEL );if (halt) { halt->msg_type =RNDIS_MSG_HALT ; halt->msg_len =ccpu2 (sizeof *halt);
drivers/usb/net/usbnet.c +2 -2
@@ -179,9 +179,9 @@ period =max ((int ) dev->status->desc.bInterval, (dev->udev->speed ==USB_SPEED_HIGH ) ?7 :3 ); - buf =kmalloc (maxp,SLAB_KERNEL ); + buf =kmalloc (maxp,GFP_KERNEL );if (buf) { - dev->interrupt =usb_alloc_urb (0 ,SLAB_KERNEL ); + dev->interrupt =usb_alloc_urb (0 ,GFP_KERNEL );if (!dev->interrupt) {kfree (buf);return -ENOMEM ;
drivers/usb/core/hub.c +2 -2
@@ -2357,7 +2357,7 @@struct usb_qualifier_descriptor *qual;int status; - qual =kmalloc (sizeof *qual,SLAB_KERNEL ); + qual =kmalloc (sizeof *qual,GFP_KERNEL );if (qual ==NULL )return ;
@@ -2908,7 +2908,7 @@if (len <le16_to_cpu (udev->config[index].desc.wTotalLength)) len =le16_to_cpu (udev->config[index].desc.wTotalLength); } - buf =kmalloc (len,SLAB_KERNEL ); + buf =kmalloc (len,GFP_KERNEL );if (buf ==NULL ) {dev_err (&udev->dev,"no mem to re-read configs after reset\n" );/* assume the worst */
drivers/usb/host/ohci-pnx4008.c +1 -1
@@ -134,7 +134,7 @@ {struct i2c_client *c; - c = (struct i2c_client *)kzalloc (sizeof (*c),SLAB_KERNEL ); + c = (struct i2c_client *)kzalloc (sizeof (*c),GFP_KERNEL );if (!c)return -ENOMEM ;
drivers/usb/host/hc_crisv10.c +1 -1
@@ -188,7 +188,7 @@#define CHECK_ALIGN (x) if (((__u32)(x)) & 0x00000003) \ {panic("Alignment check (DWORD) failed at %s:%s:%d\n", __FILE__, __FUNCTION__, __LINE__);} -#define SLAB_FLAG (in_interrupt() ? GFP_ATOMIC : SLAB_KERNEL) +#define SLAB_FLAG (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL)#define KMALLOC_FLAG (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL)/* Most helpful debugging aid */
drivers/usb/misc/usbtest.c +14 -14
@@ -213,7 +213,7 @@if (bytes <0 )return NULL ; - urb =usb_alloc_urb (0 ,SLAB_KERNEL ); + urb =usb_alloc_urb (0 ,GFP_KERNEL );if (!urb)return urb;usb_fill_bulk_urb (urb, udev, pipe,NULL , bytes, simple_callback,NULL );
@@ -223,7 +223,7 @@ urb->transfer_flags =URB_NO_TRANSFER_DMA_MAP ;if (usb_pipein (pipe)) urb->transfer_flags |=URB_SHORT_NOT_OK ; - urb->transfer_buffer =usb_buffer_alloc (udev, bytes,SLAB_KERNEL , + urb->transfer_buffer =usb_buffer_alloc (udev, bytes,GFP_KERNEL , &urb->transfer_dma);if (!urb->transfer_buffer) {usb_free_urb (urb);
@@ -315,7 +315,7 @@init_completion (&completion);if (usb_pipeout (urb->pipe))simple_fill_buf (urb); -if ((retval =usb_submit_urb (urb,SLAB_KERNEL )) !=0 ) +if ((retval =usb_submit_urb (urb,GFP_KERNEL )) !=0 )break ;/* NOTE: no timeouts; can't be broken out of by interrupt */
@@ -374,7 +374,7 @@unsigned i;unsigned size = max; - sg =kmalloc (nents *sizeof *sg,SLAB_KERNEL ); + sg =kmalloc (nents *sizeof *sg,GFP_KERNEL );if (!sg)return NULL ;
@@ -382,7 +382,7 @@char *buf;unsigned j; - buf =kzalloc (size,SLAB_KERNEL ); + buf =kzalloc (size,GFP_KERNEL );if (!buf) {free_sglist (sg, i);return NULL ;
@@ -428,7 +428,7 @@ (udev->speed ==USB_SPEED_HIGH ) ? (INTERRUPT_RATE <<3 ) :INTERRUPT_RATE , - sg, nents, 0, SLAB_KERNEL); + sg, nents, 0, GFP_KERNEL);if (retval)break ;
@@ -855,7 +855,7 @@* as with bulk/intr sglists, sglen is the queue depth; it also * controls which subtests run (more tests than sglen) or rerun. */ - urb =kcalloc (param->sglen,sizeof (struct urb *),SLAB_KERNEL ); + urb =kcalloc (param->sglen,sizeof (struct urb *),GFP_KERNEL );if (!urb)return -ENOMEM ;for (i =0 ; i < param->sglen; i++) {
@@ -981,7 +981,7 @@if (!u) goto cleanup; - reqp =usb_buffer_alloc (udev,sizeof *reqp,SLAB_KERNEL , + reqp =usb_buffer_alloc (udev,sizeof *reqp,GFP_KERNEL , &u->setup_dma);if (!reqp) goto cleanup;
@@ -1067,7 +1067,7 @@* FIXME want additional tests for when endpoint is STALLing * due to errors, or is just NAKing requests. */ -if ((retval =usb_submit_urb (urb,SLAB_KERNEL )) !=0 ) { +if ((retval =usb_submit_urb (urb,GFP_KERNEL )) !=0 ) {dev_dbg (&dev->intf->dev,"submit fail %d\n" , retval);return retval; }
@@ -1251,7 +1251,7 @@if (length <1 || length >0xffff || vary >= length)return -EINVAL ; - buf =kmalloc (length,SLAB_KERNEL ); + buf =kmalloc (length,GFP_KERNEL );if (!buf)return -ENOMEM ;
@@ -1403,7 +1403,7 @@ maxp *=1 + (0x3 & (le16_to_cpu (desc->wMaxPacketSize) >>11 )); packets = (bytes + maxp -1 ) / maxp; - urb =usb_alloc_urb (packets,SLAB_KERNEL ); + urb =usb_alloc_urb (packets,GFP_KERNEL );if (!urb)return urb; urb->dev = udev;
@@ -1411,7 +1411,7 @@ urb->number_of_packets = packets; urb->transfer_buffer_length = bytes; - urb->transfer_buffer =usb_buffer_alloc (udev, bytes,SLAB_KERNEL , + urb->transfer_buffer =usb_buffer_alloc (udev, bytes,GFP_KERNEL , &urb->transfer_dma);if (!urb->transfer_buffer) {usb_free_urb (urb);
@@ -1900,7 +1900,7 @@ }#endif - dev =kzalloc (sizeof (*dev),SLAB_KERNEL ); + dev =kzalloc (sizeof (*dev),GFP_KERNEL );if (!dev)return -ENOMEM ; info = (struct usbtest_info *) id->driver_info;
@@ -1910,7 +1910,7 @@ dev->intf = intf;/* cacheline-aligned scratch for i/o */ -if ((dev->buf =kmalloc (TBUF_SIZE ,SLAB_KERNEL )) ==NULL ) { +if ((dev->buf =kmalloc (TBUF_SIZE ,GFP_KERNEL )) ==NULL ) {kfree (dev);return -ENOMEM ; }
drivers/usb/input/acecad.c +1 -1
@@ -152,7 +152,7 @@if (!acecad || !input_dev) goto fail1; - acecad->data =usb_buffer_alloc (dev,8 ,SLAB_KERNEL , &acecad->data_dma); + acecad->data =usb_buffer_alloc (dev,8 ,GFP_KERNEL , &acecad->data_dma);if (!acecad->data) goto fail1;
drivers/usb/input/usbtouchscreen.c +1 -1
@@ -680,7 +680,7 @@ type->process_pkt = usbtouch_process_pkt; usbtouch->data =usb_buffer_alloc (udev, type->rept_size, -SLAB_KERNEL , &usbtouch->data_dma); +GFP_KERNEL , &usbtouch->data_dma);if (!usbtouch->data) goto out_free;
drivers/usb/gadget/gmidi.c +1 -1
@@ -1236,7 +1236,7 @@/* ok, we made sense of the hardware ... */ - dev =kzalloc (sizeof (*dev),SLAB_KERNEL ); + dev =kzalloc (sizeof (*dev),GFP_KERNEL );if (!dev) {return -ENOMEM ; }
drivers/usb/gadget/net2280.c +1 -1
@@ -2857,7 +2857,7 @@ }/* alloc, and start init */ - dev =kzalloc (sizeof *dev,SLAB_KERNEL ); + dev =kzalloc (sizeof *dev,GFP_KERNEL );if (dev ==NULL ){ retval = -ENOMEM ; goto done;
drivers/usb/gadget/goku_udc.c +1 -1
@@ -1864,7 +1864,7 @@ }/* alloc, and start init */ - dev =kmalloc (sizeof *dev,SLAB_KERNEL ); + dev =kmalloc (sizeof *dev,GFP_KERNEL );if (dev ==NULL ){pr_debug ("enomem %s\n" ,pci_name (pdev)); retval = -ENOMEM ;
drivers/usb/gadget/zero.c +1 -1
@@ -1190,7 +1190,7 @@/* ok, we made sense of the hardware ... */ - dev =kzalloc (sizeof (*dev),SLAB_KERNEL ); + dev =kzalloc (sizeof (*dev),GFP_KERNEL );if (!dev)return -ENOMEM ;spin_lock_init (&dev->lock);
drivers/usb/gadget/omap_udc.c +1 -1
@@ -2581,7 +2581,7 @@/* UDC_PULLUP_EN gates the chip clock */ // OTG_SYSCON_1_REG |= DEV_IDLE_EN; - udc =kzalloc (sizeof (*udc),SLAB_KERNEL ); + udc =kzalloc (sizeof (*udc),GFP_KERNEL );if (!udc)return -ENOMEM ;
drivers/usb/gadget/inode.c +3 -3
@@ -412,7 +412,7 @@/* FIXME readahead for O_NONBLOCK and poll(); careful with ZLPs */ value = -ENOMEM ; - kbuf =kmalloc (len,SLAB_KERNEL ); + kbuf =kmalloc (len,GFP_KERNEL );if (unlikely (!kbuf)) goto free1;
@@ -456,7 +456,7 @@/* FIXME writebehind for O_NONBLOCK and poll(), qlen = 1 */ value = -ENOMEM ; - kbuf =kmalloc (len,SLAB_KERNEL ); + kbuf =kmalloc (len,GFP_KERNEL );if (!kbuf) goto free1;if (copy_from_user (kbuf, buf, len)) {
@@ -1898,7 +1898,7 @@ buf +=4 ; length -=4 ; - kbuf =kmalloc (length,SLAB_KERNEL ); + kbuf =kmalloc (length,GFP_KERNEL );if (!kbuf)return -ENOMEM ;if (copy_from_user (kbuf, buf, length)) {
drivers/base/dmapool.c +1 -1
@@ -126,7 +126,7 @@ }else if (allocation < size)return NULL ; -if (!(retval =kmalloc (sizeof *retval,SLAB_KERNEL ))) +if (!(retval =kmalloc (sizeof *retval,GFP_KERNEL )))return retval;strlcpy (retval->name, name,sizeof retval->name);
drivers/isdn/gigaset/usb-gigaset.c +3 -3
@@ -763,7 +763,7 @@ goto error; } - ucs->bulk_out_urb =usb_alloc_urb (0 ,SLAB_KERNEL ); + ucs->bulk_out_urb =usb_alloc_urb (0 ,GFP_KERNEL );if (!ucs->bulk_out_urb) {dev_err (cs->dev,"Couldn't allocate bulk_out_urb\n" ); retval = -ENOMEM ;
@@ -774,7 +774,7 @@atomic_set (&ucs->busy,0 ); - ucs->read_urb =usb_alloc_urb (0 ,SLAB_KERNEL ); + ucs->read_urb =usb_alloc_urb (0 ,GFP_KERNEL );if (!ucs->read_urb) {dev_err (cs->dev,"No free urbs available\n" ); retval = -ENOMEM ;
@@ -797,7 +797,7 @@ gigaset_read_int_callback, cs->inbuf + 0, endpoint->bInterval); - retval =usb_submit_urb (ucs->read_urb,SLAB_KERNEL ); + retval =usb_submit_urb (ucs->read_urb,GFP_KERNEL );if (retval) {dev_err (cs->dev,"Could not submit URB (error %d)\n" , -retval); goto error;
drivers/isdn/gigaset/bas-gigaset.c +7 -7
@@ -2218,21 +2218,21 @@* - three for the different uses of the default control pipe * - three for each isochronous pipe */ -if (!(ucs->urb_int_in =usb_alloc_urb (0 ,SLAB_KERNEL )) || - !(ucs->urb_cmd_in =usb_alloc_urb (0 ,SLAB_KERNEL )) || - !(ucs->urb_cmd_out =usb_alloc_urb (0 ,SLAB_KERNEL )) || - !(ucs->urb_ctrl =usb_alloc_urb (0 ,SLAB_KERNEL ))) +if (!(ucs->urb_int_in =usb_alloc_urb (0 ,GFP_KERNEL )) || + !(ucs->urb_cmd_in =usb_alloc_urb (0 ,GFP_KERNEL )) || + !(ucs->urb_cmd_out =usb_alloc_urb (0 ,GFP_KERNEL )) || + !(ucs->urb_ctrl =usb_alloc_urb (0 ,GFP_KERNEL ))) goto allocerr;for (j =0 ; j <2 ; ++j) { ubc = cs->bcs[j].hw.bas;for (i =0 ; i <BAS_OUTURBS ; ++i)if (!(ubc->isoouturbs[i].urb = -usb_alloc_urb (BAS_NUMFRAMES ,SLAB_KERNEL ))) +usb_alloc_urb (BAS_NUMFRAMES ,GFP_KERNEL ))) goto allocerr;for (i =0 ; i <BAS_INURBS ; ++i)if (!(ubc->isoinurbs[i] = -usb_alloc_urb (BAS_NUMFRAMES ,SLAB_KERNEL ))) +usb_alloc_urb (BAS_NUMFRAMES ,GFP_KERNEL ))) goto allocerr; }
@@ -2246,7 +2246,7 @@ (endpoint->bEndpointAddress) & 0x0f), ucs->int_in_buf,3 , read_int_callback, cs, endpoint->bInterval); -if ((rc =usb_submit_urb (ucs->urb_int_in,SLAB_KERNEL )) !=0 ) { +if ((rc =usb_submit_urb (ucs->urb_int_in,GFP_KERNEL )) !=0 ) {dev_err (cs->dev,"could not submit interrupt URB: %s\n" ,get_usb_rcmsg (rc)); goto error;
drivers/scsi/ipr.c +1 -1
@@ -6939,7 +6939,7 @@return -ENOMEM ;for (i =0 ; i <IPR_NUM_CMD_BLKS ; i++) { - ipr_cmd =pci_pool_alloc (ioa_cfg->ipr_cmd_pool,SLAB_KERNEL , &dma_addr); + ipr_cmd =pci_pool_alloc (ioa_cfg->ipr_cmd_pool,GFP_KERNEL , &dma_addr);if (!ipr_cmd) {ipr_free_cmd_blks (ioa_cfg);
drivers/infiniband/hw/ehca/ehca_av.c +1 -1
@@ -57,7 +57,7 @@ struct ehca_shca *shca = container_of(pd->device, struct ehca_shca, ib_device); - av =kmem_cache_alloc (av_cache,SLAB_KERNEL ); + av =kmem_cache_alloc (av_cache,GFP_KERNEL );if (!av) {ehca_err (pd->device,"Out of memory pd=%p ah_attr=%p" , pd, ah_attr);
drivers/infiniband/hw/ehca/ehca_cq.c +1 -1
@@ -134,7 +134,7 @@if (cqe >=0xFFFFFFFF -64 - additional_cqe)return ERR_PTR (-EINVAL ); - my_cq =kmem_cache_alloc (cq_cache,SLAB_KERNEL ); + my_cq =kmem_cache_alloc (cq_cache,GFP_KERNEL );if (!my_cq) {ehca_err (device,"Out of memory for ehca_cq struct device=%p" , device);
drivers/infiniband/hw/ehca/ehca_pd.c +1 -1
@@ -50,7 +50,7 @@ {struct ehca_pd *pd; - pd =kmem_cache_alloc (pd_cache,SLAB_KERNEL ); + pd =kmem_cache_alloc (pd_cache,GFP_KERNEL );if (!pd) {ehca_err (device,"device=%p context=%p out of memory" , device, context);
drivers/infiniband/hw/ehca/ehca_qp.c +1 -1
@@ -450,7 +450,7 @@if (pd->uobject && udata) context = pd->uobject->context; - my_qp =kmem_cache_alloc (qp_cache,SLAB_KERNEL ); + my_qp =kmem_cache_alloc (qp_cache,GFP_KERNEL );if (!my_qp) {ehca_err (pd->device,"pd=%p not enough memory to alloc qp" , pd);return ERR_PTR (-ENOMEM );
drivers/infiniband/hw/ehca/ehca_main.c +1 -1
@@ -108,7 +108,7 @@void *ehca_alloc_fw_ctrlblock (void ) { -void *ret =kmem_cache_zalloc (ctblk_cache,SLAB_KERNEL ); +void *ret =kmem_cache_zalloc (ctblk_cache,GFP_KERNEL );if (!ret)ehca_gen_err ("Out of memory for ctblk" );return ret;
drivers/infiniband/hw/ehca/ehca_mrmw.c +2 -2
@@ -53,7 +53,7 @@ {struct ehca_mr *me; - me =kmem_cache_alloc (mr_cache,SLAB_KERNEL ); + me =kmem_cache_alloc (mr_cache,GFP_KERNEL );if (me) {memset (me,0 ,sizeof (struct ehca_mr ));spin_lock_init (&me->mrlock);
@@ -72,7 +72,7 @@ {struct ehca_mw *me; - me =kmem_cache_alloc (mw_cache,SLAB_KERNEL ); + me =kmem_cache_alloc (mw_cache,GFP_KERNEL );if (me) {memset (me,0 ,sizeof (struct ehca_mw ));spin_lock_init (&me->mwlock);
drivers/input/touchscreen/ads7846.c +1 -1
@@ -190,7 +190,7 @@ {struct spi_device *spi =to_spi_device (dev);struct ads7846 *ts =dev_get_drvdata (dev); -struct ser_req *req =kzalloc (sizeof *req,SLAB_KERNEL ); +struct ser_req *req =kzalloc (sizeof *req,GFP_KERNEL );int status;int sample;int i;
drivers/media/dvb/cinergyT2/cinergyT2.c +1 -1
@@ -286,7 +286,7 @@int i; cinergyt2->streambuf =usb_buffer_alloc (cinergyt2->udev,STREAM_URB_COUNT *STREAM_BUF_SIZE , -SLAB_KERNEL , &cinergyt2->streambuf_dmahandle); +GFP_KERNEL , &cinergyt2->streambuf_dmahandle);if (!cinergyt2->streambuf) {dprintk (1 ,"failed to alloc consistent stream memory area, bailing out!\n" );return -ENOMEM ;
drivers/ieee1394/raw1394.c +5 -5
@@ -127,7 +127,7 @@static inline struct pending_request *alloc_pending_request (void ) { -return __alloc_pending_request (SLAB_KERNEL ); +return __alloc_pending_request (GFP_KERNEL ); }static void free_pending_request (struct pending_request *req)
@@ -1752,7 +1752,7 @@return (-EINVAL ); }/* addr-list-entry for fileinfo */ - addr =kmalloc (sizeof (*addr),SLAB_KERNEL ); + addr =kmalloc (sizeof (*addr),GFP_KERNEL );if (!addr) { req->req.length =0 ;return (-ENOMEM );
@@ -2118,7 +2118,7 @@static int get_config_rom (struct file_info *fi,struct pending_request *req) {int ret =sizeof (struct raw1394_request ); -quadlet_t *data =kmalloc (req->req.length,SLAB_KERNEL ); +quadlet_t *data =kmalloc (req->req.length,GFP_KERNEL );int status;if (!data)
@@ -2148,7 +2148,7 @@static int update_config_rom (struct file_info *fi,struct pending_request *req) {int ret =sizeof (struct raw1394_request ); -quadlet_t *data =kmalloc (req->req.length,SLAB_KERNEL ); +quadlet_t *data =kmalloc (req->req.length,GFP_KERNEL );if (!data)return -ENOMEM ;if (copy_from_user (data,int2ptr (req->req.sendb), req->req.length)) {
@@ -2796,7 +2796,7 @@ {struct file_info *fi; - fi =kzalloc (sizeof (*fi),SLAB_KERNEL ); + fi =kzalloc (sizeof (*fi),GFP_KERNEL );if (!fi)return -ENOMEM ;
drivers/ieee1394/ohci1394.c +4 -4
@@ -1223,7 +1223,7 @@int ctx;int ret = -ENOMEM ; - recv =kmalloc (sizeof (*recv),SLAB_KERNEL ); + recv =kmalloc (sizeof (*recv),GFP_KERNEL );if (!recv)return -ENOMEM ;
@@ -1916,7 +1916,7 @@int ctx;int ret = -ENOMEM ; - xmit =kmalloc (sizeof (*xmit),SLAB_KERNEL ); + xmit =kmalloc (sizeof (*xmit),GFP_KERNEL );if (!xmit)return -ENOMEM ;
@@ -3019,7 +3019,7 @@return -ENOMEM ; } - d->prg_cpu[i] =pci_pool_alloc (d->prg_pool,SLAB_KERNEL , d->prg_bus+i); + d->prg_cpu[i] =pci_pool_alloc (d->prg_pool,GFP_KERNEL , d->prg_bus+i);OHCI_DMA_ALLOC ("pool dma_rcv prg[%d]" , i);if (d->prg_cpu[i] !=NULL ) {
@@ -3115,7 +3115,7 @@OHCI_DMA_ALLOC ("dma_rcv prg pool" );for (i =0 ; i < d->num_desc; i++) { - d->prg_cpu[i] =pci_pool_alloc (d->prg_pool,SLAB_KERNEL , d->prg_bus+i); + d->prg_cpu[i] =pci_pool_alloc (d->prg_pool,GFP_KERNEL , d->prg_bus+i);OHCI_DMA_ALLOC ("pool dma_trm prg[%d]" , i);if (d->prg_cpu[i] !=NULL ) {
drivers/ieee1394/hosts.c +1 -1
@@ -125,7 +125,7 @@int i;int hostnum =0 ; - h =kzalloc (sizeof (*h) + extra,SLAB_KERNEL ); + h =kzalloc (sizeof (*h) + extra,GFP_KERNEL );if (!h)return NULL ;
drivers/ieee1394/pcilynx.c +1 -1
@@ -1428,7 +1428,7 @@struct i2c_algo_bit_data i2c_adapter_data; error = -ENOMEM ; - i2c_ad =kmemdup (&bit_ops,sizeof (*i2c_ad),SLAB_KERNEL ); + i2c_ad =kmemdup (&bit_ops,sizeof (*i2c_ad),GFP_KERNEL );if (!i2c_ad)FAIL ("failed to allocate I2C adapter memory" ); i2c_adapter_data = bit_data;
fs/afs/super.c +1 -1
@@ -412,7 +412,7 @@struct afs_vnode *vnode; vnode = (struct afs_vnode *) -kmem_cache_alloc (afs_inode_cachep,SLAB_KERNEL ); +kmem_cache_alloc (afs_inode_cachep,GFP_KERNEL );if (!vnode)return NULL ;
fs/bfs/inode.c +1 -1
@@ -233,7 +233,7 @@static struct inode *bfs_alloc_inode (struct super_block *sb) {struct bfs_inode_info *bi; - bi =kmem_cache_alloc (bfs_inode_cachep,SLAB_KERNEL ); + bi =kmem_cache_alloc (bfs_inode_cachep,GFP_KERNEL );if (!bi)return NULL ;return &bi->vfs_inode;
fs/efs/super.c +1 -1
@@ -57,7 +57,7 @@static struct inode *efs_alloc_inode (struct super_block *sb) {struct efs_inode_info *ei; - ei = (struct efs_inode_info *)kmem_cache_alloc (efs_inode_cachep,SLAB_KERNEL ); + ei = (struct efs_inode_info *)kmem_cache_alloc (efs_inode_cachep,GFP_KERNEL );if (!ei)return NULL ;return &ei->vfs_inode;
fs/fat/cache.c +1 -1
@@ -63,7 +63,7 @@static inline struct fat_cache *fat_cache_alloc (struct inode *inode) { -return kmem_cache_alloc (fat_cache_cachep,SLAB_KERNEL ); +return kmem_cache_alloc (fat_cache_cachep,GFP_KERNEL ); }static inline void fat_cache_free (struct fat_cache *cache)
fs/fat/inode.c +1 -1
@@ -482,7 +482,7 @@static struct inode *fat_alloc_inode (struct super_block *sb) {struct msdos_inode_info *ei; - ei =kmem_cache_alloc (fat_inode_cachep,SLAB_KERNEL ); + ei =kmem_cache_alloc (fat_inode_cachep,GFP_KERNEL );if (!ei)return NULL ;return &ei->vfs_inode;
fs/hfs/super.c +1 -1
@@ -145,7 +145,7 @@ {struct hfs_inode_info *i; - i =kmem_cache_alloc (hfs_inode_cachep,SLAB_KERNEL ); + i =kmem_cache_alloc (hfs_inode_cachep,GFP_KERNEL );return i ? &i->vfs_inode :NULL ; }
fs/nfs/direct.c +1 -1
@@ -143,7 +143,7 @@ {struct nfs_direct_req *dreq; - dreq =kmem_cache_alloc (nfs_direct_cachep,SLAB_KERNEL ); + dreq =kmem_cache_alloc (nfs_direct_cachep,GFP_KERNEL );if (!dreq)return NULL ;
fs/nfs/pagelist.c +1 -1
@@ -25,7 +25,7 @@nfs_page_alloc (void) {struct nfs_page *p; - p =kmem_cache_alloc (nfs_page_cachep,SLAB_KERNEL ); + p =kmem_cache_alloc (nfs_page_cachep,GFP_KERNEL );if (p) {memset (p,0 ,sizeof (*p));INIT_LIST_HEAD (&p->wb_list);
fs/nfs/inode.c +1 -1
@@ -1070,7 +1070,7 @@struct inode *nfs_alloc_inode (struct super_block *sb) {struct nfs_inode *nfsi; - nfsi = (struct nfs_inode *)kmem_cache_alloc (nfs_inode_cachep,SLAB_KERNEL ); + nfsi = (struct nfs_inode *)kmem_cache_alloc (nfs_inode_cachep,GFP_KERNEL );if (!nfsi)return NULL ; nfsi->flags =0UL ;
fs/udf/super.c +1 -1
@@ -112,7 +112,7 @@static struct inode *udf_alloc_inode (struct super_block *sb) {struct udf_inode_info *ei; - ei = (struct udf_inode_info *)kmem_cache_alloc (udf_inode_cachep,SLAB_KERNEL ); + ei = (struct udf_inode_info *)kmem_cache_alloc (udf_inode_cachep,GFP_KERNEL );if (!ei)return NULL ;
fs/ufs/super.c +1 -1
@@ -1209,7 +1209,7 @@static struct inode *ufs_alloc_inode (struct super_block *sb) {struct ufs_inode_info *ei; - ei = (struct ufs_inode_info *)kmem_cache_alloc (ufs_inode_cachep,SLAB_KERNEL ); + ei = (struct ufs_inode_info *)kmem_cache_alloc (ufs_inode_cachep,GFP_KERNEL );if (!ei)return NULL ; ei->vfs_inode.i_version =1 ;
fs/ecryptfs/crypto.c +1 -1
@@ -628,7 +628,7 @@ num_extents_per_page =PAGE_CACHE_SIZE / crypt_stat->extent_size; base_extent = (page->index * num_extents_per_page); lower_page_virt =kmem_cache_alloc (ecryptfs_lower_page_cache, -SLAB_KERNEL ); +GFP_KERNEL );if (!lower_page_virt) { rc = -ENOMEM ; ecryptfs_printk(KERN_ERR, "Error getting page for encrypted "
fs/ecryptfs/keystore.c +1 -1
@@ -207,7 +207,7 @@/* Released: wipe_auth_tok_list called in ecryptfs_parse_packet_set or * at end of function upon failure */ auth_tok_list_item = -kmem_cache_alloc (ecryptfs_auth_tok_list_item_cache,SLAB_KERNEL ); +kmem_cache_alloc (ecryptfs_auth_tok_list_item_cache,GFP_KERNEL );if (!auth_tok_list_item) {ecryptfs_printk (KERN_ERR ,"Unable to allocate memory\n" ); rc = -ENOMEM ;
fs/ecryptfs/super.c +1 -1
@@ -50,7 +50,7 @@struct inode *inode =NULL ; ecryptfs_inode =kmem_cache_alloc (ecryptfs_inode_info_cache, -SLAB_KERNEL ); +GFP_KERNEL );if (unlikely (!ecryptfs_inode)) goto out;ecryptfs_init_crypt_stat (&ecryptfs_inode->crypt_stat);
fs/ecryptfs/file.c +1 -1
@@ -251,7 +251,7 @@int lower_flags;/* Released in ecryptfs_release or end of function if failure */ - file_info =kmem_cache_alloc (ecryptfs_file_info_cache,SLAB_KERNEL ); + file_info =kmem_cache_alloc (ecryptfs_file_info_cache,GFP_KERNEL );ecryptfs_set_file_private (file, file_info);if (!file_info) { ecryptfs_printk(KERN_ERR,
fs/ecryptfs/main.c +2 -2
@@ -379,7 +379,7 @@/* Released in ecryptfs_put_super() */ ecryptfs_set_superblock_private (sb,kmem_cache_alloc (ecryptfs_sb_info_cache, -SLAB_KERNEL )); +GFP_KERNEL ));if (!ecryptfs_superblock_to_private (sb)) {ecryptfs_printk (KERN_WARNING ,"Out of memory\n" ); rc = -ENOMEM ;
@@ -403,7 +403,7 @@/* through deactivate_super(sb) from get_sb_nodev() */ ecryptfs_set_dentry_private (sb->s_root,kmem_cache_alloc (ecryptfs_dentry_info_cache, -SLAB_KERNEL )); +GFP_KERNEL ));if (!ecryptfs_dentry_to_private (sb->s_root)) {ecryptfs_printk (KERN_ERR ,"dentry_info_cache alloc failed\n" );
fs/ecryptfs/inode.c +2 -2
@@ -328,7 +328,7 @@BUG_ON (!atomic_read (&lower_dentry->d_count));ecryptfs_set_dentry_private (dentry,kmem_cache_alloc (ecryptfs_dentry_info_cache, -SLAB_KERNEL )); +GFP_KERNEL ));if (!ecryptfs_dentry_to_private (dentry)) { rc = -ENOMEM ; ecryptfs_printk(KERN_ERR, "Out of memory whilst attempting "
@@ -758,7 +758,7 @@/* Released at out_free: label */ ecryptfs_set_file_private (&fake_ecryptfs_file,kmem_cache_alloc (ecryptfs_file_info_cache, -SLAB_KERNEL )); +GFP_KERNEL ));if (unlikely (!ecryptfs_file_to_private (&fake_ecryptfs_file))) { rc = -ENOMEM ; goto out;
fs/adfs/super.c +1 -1
@@ -217,7 +217,7 @@static struct inode *adfs_alloc_inode (struct super_block *sb) {struct adfs_inode_info *ei; - ei = (struct adfs_inode_info *)kmem_cache_alloc (adfs_inode_cachep,SLAB_KERNEL ); + ei = (struct adfs_inode_info *)kmem_cache_alloc (adfs_inode_cachep,GFP_KERNEL );if (!ei)return NULL ;return &ei->vfs_inode;
fs/affs/super.c +1 -1
@@ -71,7 +71,7 @@static struct inode *affs_alloc_inode (struct super_block *sb) {struct affs_inode_info *ei; - ei = (struct affs_inode_info *)kmem_cache_alloc (affs_inode_cachep,SLAB_KERNEL ); + ei = (struct affs_inode_info *)kmem_cache_alloc (affs_inode_cachep,GFP_KERNEL );if (!ei)return NULL ; ei->vfs_inode.i_version =1 ;
fs/befs/linuxvfs.c +1 -1
@@ -277,7 +277,7 @@ {struct befs_inode_info *bi; bi = (struct befs_inode_info *)kmem_cache_alloc (befs_inode_cachep, -SLAB_KERNEL ); +GFP_KERNEL );if (!bi)return NULL ;return &bi->vfs_inode;
fs/cifs/cifsfs.c +1 -1
@@ -246,7 +246,7 @@ cifs_alloc_inode(struct super_block *sb) {struct cifsInodeInfo *cifs_inode; - cifs_inode =kmem_cache_alloc (cifs_inode_cachep,SLAB_KERNEL ); + cifs_inode =kmem_cache_alloc (cifs_inode_cachep,GFP_KERNEL );if (!cifs_inode)return NULL ; cifs_inode->cifsAttrs =0x20 ;/* default */
fs/cifs/misc.c +2 -2
@@ -153,7 +153,7 @@albeit slightly larger than necessary and maxbuffersize defaults to this and can not be bigger */ ret_buf = - (struct smb_hdr *)mempool_alloc (cifs_req_poolp,SLAB_KERNEL |GFP_NOFS ); + (struct smb_hdr *)mempool_alloc (cifs_req_poolp,GFP_KERNEL |GFP_NOFS );/* clear the first few header bytes */ /* for most paths, more is cleared in header_assemble */
@@ -192,7 +192,7 @@albeit slightly larger than necessary and maxbuffersize defaults to this and can not be bigger */ ret_buf = - (struct smb_hdr *)mempool_alloc (cifs_sm_req_poolp,SLAB_KERNEL |GFP_NOFS ); + (struct smb_hdr *)mempool_alloc (cifs_sm_req_poolp,GFP_KERNEL |GFP_NOFS );if (ret_buf) {/* No need to clear memory here, cleared in header assemble */ /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
fs/cifs/transport.c +2 -2
@@ -51,7 +51,7 @@ } temp = (struct mid_q_entry *)mempool_alloc (cifs_mid_poolp, -SLAB_KERNEL |GFP_NOFS ); +GFP_KERNEL |GFP_NOFS );if (temp ==NULL )return temp;else {
@@ -118,7 +118,7 @@return NULL ; } temp = (struct oplock_q_entry *)kmem_cache_alloc (cifs_oplock_cachep, -SLAB_KERNEL ); +GFP_KERNEL );if (temp ==NULL )return temp;else {
fs/coda/inode.c +1 -1
@@ -43,7 +43,7 @@static struct inode *coda_alloc_inode (struct super_block *sb) {struct coda_inode_info *ei; - ei = (struct coda_inode_info *)kmem_cache_alloc (coda_inode_cachep,SLAB_KERNEL ); + ei = (struct coda_inode_info *)kmem_cache_alloc (coda_inode_cachep,GFP_KERNEL );if (!ei)return NULL ;memset (&ei->c_fid,0 ,sizeof (struct CodaFid ));
fs/ext2/super.c +1 -1
@@ -140,7 +140,7 @@static struct inode *ext2_alloc_inode (struct super_block *sb) {struct ext2_inode_info *ei; - ei = (struct ext2_inode_info *)kmem_cache_alloc (ext2_inode_cachep,SLAB_KERNEL ); + ei = (struct ext2_inode_info *)kmem_cache_alloc (ext2_inode_cachep,GFP_KERNEL );if (!ei)return NULL ;#ifdef CONFIG_EXT2_FS_POSIX_ACL
fs/fuse/dev.c +1 -1
@@ -41,7 +41,7 @@struct fuse_req *fuse_request_alloc (void ) { -struct fuse_req *req =kmem_cache_alloc (fuse_req_cachep,SLAB_KERNEL ); +struct fuse_req *req =kmem_cache_alloc (fuse_req_cachep,GFP_KERNEL );if (req)fuse_request_init (req);return req;
fs/fuse/inode.c +1 -1
@@ -47,7 +47,7 @@struct inode *inode;struct fuse_inode *fi; - inode =kmem_cache_alloc (fuse_inode_cachep,SLAB_KERNEL ); + inode =kmem_cache_alloc (fuse_inode_cachep,GFP_KERNEL );if (!inode)return NULL ;
fs/proc/inode.c +1 -1
@@ -88,7 +88,7 @@struct proc_inode *ei;struct inode *inode; - ei = (struct proc_inode *)kmem_cache_alloc (proc_inode_cachep,SLAB_KERNEL ); + ei = (struct proc_inode *)kmem_cache_alloc (proc_inode_cachep,GFP_KERNEL );if (!ei)return NULL ; ei->pid =NULL ;
fs/qnx4/inode.c +1 -1
@@ -520,7 +520,7 @@static struct inode *qnx4_alloc_inode (struct super_block *sb) {struct qnx4_inode_info *ei; - ei =kmem_cache_alloc (qnx4_inode_cachep,SLAB_KERNEL ); + ei =kmem_cache_alloc (qnx4_inode_cachep,GFP_KERNEL );if (!ei)return NULL ;return &ei->vfs_inode;
fs/sysv/inode.c +1 -1
@@ -307,7 +307,7 @@ {struct sysv_inode_info *si; - si =kmem_cache_alloc (sysv_inode_cachep,SLAB_KERNEL ); + si =kmem_cache_alloc (sysv_inode_cachep,GFP_KERNEL );if (!si)return NULL ;return &si->vfs_inode;
fs/reiserfs/super.c +1 -1
@@ -496,7 +496,7 @@ {struct reiserfs_inode_info *ei; ei = (struct reiserfs_inode_info *) -kmem_cache_alloc (reiserfs_inode_cachep,SLAB_KERNEL ); +kmem_cache_alloc (reiserfs_inode_cachep,GFP_KERNEL );if (!ei)return NULL ;return &ei->vfs_inode;
fs/block_dev.c +1 -1
@@ -241,7 +241,7 @@static struct inode *bdev_alloc_inode (struct super_block *sb) { -struct bdev_inode *ei =kmem_cache_alloc (bdev_cachep,SLAB_KERNEL ); +struct bdev_inode *ei =kmem_cache_alloc (bdev_cachep,GFP_KERNEL );if (!ei)return NULL ;return &ei->vfs_inode;
fs/jffs2/super.c +1 -1
@@ -33,7 +33,7 @@static struct inode *jffs2_alloc_inode (struct super_block *sb) {struct jffs2_inode_info *ei; - ei = (struct jffs2_inode_info *)kmem_cache_alloc (jffs2_inode_cachep,SLAB_KERNEL ); + ei = (struct jffs2_inode_info *)kmem_cache_alloc (jffs2_inode_cachep,GFP_KERNEL );if (!ei)return NULL ;return &ei->vfs_inode;
fs/isofs/inode.c +1 -1
@@ -62,7 +62,7 @@static struct inode *isofs_alloc_inode (struct super_block *sb) {struct iso_inode_info *ei; - ei =kmem_cache_alloc (isofs_inode_cachep,SLAB_KERNEL ); + ei =kmem_cache_alloc (isofs_inode_cachep,GFP_KERNEL );if (!ei)return NULL ;return &ei->vfs_inode;
fs/minix/inode.c +1 -1
@@ -56,7 +56,7 @@static struct inode *minix_alloc_inode (struct super_block *sb) {struct minix_inode_info *ei; - ei = (struct minix_inode_info *)kmem_cache_alloc (minix_inode_cachep,SLAB_KERNEL ); + ei = (struct minix_inode_info *)kmem_cache_alloc (minix_inode_cachep,GFP_KERNEL );if (!ei)return NULL ;return &ei->vfs_inode;
fs/ncpfs/inode.c +1 -1
@@ -45,7 +45,7 @@static struct inode *ncp_alloc_inode (struct super_block *sb) {struct ncp_inode_info *ei; - ei = (struct ncp_inode_info *)kmem_cache_alloc (ncp_inode_cachep,SLAB_KERNEL ); + ei = (struct ncp_inode_info *)kmem_cache_alloc (ncp_inode_cachep,GFP_KERNEL );if (!ei)return NULL ;return &ei->vfs_inode;
fs/romfs/inode.c +1 -1
@@ -555,7 +555,7 @@static struct inode *romfs_alloc_inode (struct super_block *sb) {struct romfs_inode_info *ei; - ei = (struct romfs_inode_info *)kmem_cache_alloc (romfs_inode_cachep,SLAB_KERNEL ); + ei = (struct romfs_inode_info *)kmem_cache_alloc (romfs_inode_cachep,GFP_KERNEL );if (!ei)return NULL ;return &ei->vfs_inode;
fs/smbfs/request.c +1 -1
@@ -61,7 +61,7 @@struct smb_request *req;unsigned char *buf =NULL ; - req =kmem_cache_alloc (req_cachep,SLAB_KERNEL ); + req =kmem_cache_alloc (req_cachep,GFP_KERNEL );VERBOSE ("allocating request: %p\n" , req);if (!req) goto out;
fs/smbfs/inode.c +1 -1
@@ -55,7 +55,7 @@static struct inode *smb_alloc_inode (struct super_block *sb) {struct smb_inode_info *ei; - ei = (struct smb_inode_info *)kmem_cache_alloc (smb_inode_cachep,SLAB_KERNEL ); + ei = (struct smb_inode_info *)kmem_cache_alloc (smb_inode_cachep,GFP_KERNEL );if (!ei)return NULL ;return &ei->vfs_inode;
fs/fcntl.c +1 -1
@@ -566,7 +566,7 @@int result =0 ;if (on) { - new =kmem_cache_alloc (fasync_cache,SLAB_KERNEL ); + new =kmem_cache_alloc (fasync_cache,GFP_KERNEL );if (!new)return -ENOMEM ; }
fs/locks.c +1 -1
@@ -147,7 +147,7 @@/* Allocate an empty lock structure. */ static struct file_lock *locks_alloc_lock (void ) { -return kmem_cache_alloc (filelock_cache,SLAB_KERNEL ); +return kmem_cache_alloc (filelock_cache,GFP_KERNEL ); }static void locks_release_private (struct file_lock *fl)
fs/eventpoll.c +2 -2
@@ -961,7 +961,7 @@struct epitem *epi =ep_item_from_epqueue (pt);struct eppoll_entry *pwq; -if (epi->nwait >=0 && (pwq =kmem_cache_alloc (pwq_cache,SLAB_KERNEL ))) { +if (epi->nwait >=0 && (pwq =kmem_cache_alloc (pwq_cache,GFP_KERNEL ))) {init_waitqueue_func_entry (&pwq->wait, ep_poll_callback); pwq->whead = whead; pwq->base = epi;
@@ -1004,7 +1004,7 @@struct ep_pqueue epq; error = -ENOMEM ; -if (!(epi =kmem_cache_alloc (epi_cache,SLAB_KERNEL ))) +if (!(epi =kmem_cache_alloc (epi_cache,GFP_KERNEL ))) goto eexit_1;/* Item initialization follow here ... */
fs/exec.c +1 -1
@@ -405,7 +405,7 @@ bprm->loader += stack_base; bprm->exec += stack_base; - mpnt =kmem_cache_alloc (vm_area_cachep,SLAB_KERNEL ); + mpnt =kmem_cache_alloc (vm_area_cachep,GFP_KERNEL );if (!mpnt)return -ENOMEM ;
fs/dnotify.c +1 -1
@@ -77,7 +77,7 @@ inode = filp->f_path.dentry->d_inode;if (!S_ISDIR (inode->i_mode))return -ENOTDIR ; - dn =kmem_cache_alloc (dn_cache,SLAB_KERNEL ); + dn =kmem_cache_alloc (dn_cache,GFP_KERNEL );if (dn ==NULL )return -ENOMEM ;spin_lock (&inode->i_lock);
fs/freevxfs/vxfs_inode.c +2 -2
@@ -103,7 +103,7 @@struct vxfs_inode_info *vip;struct vxfs_dinode *dip; -if (!(vip =kmem_cache_alloc (vxfs_inode_cachep,SLAB_KERNEL ))) +if (!(vip =kmem_cache_alloc (vxfs_inode_cachep,GFP_KERNEL ))) goto fail; dip = (struct vxfs_dinode *)(bp->b_data + offset);memcpy (vip, dip,sizeof (*vip));
@@ -145,7 +145,7 @@struct vxfs_dinode *dip;caddr_t kaddr = (char *)page_address (pp); -if (!(vip =kmem_cache_alloc (vxfs_inode_cachep,SLAB_KERNEL ))) +if (!(vip =kmem_cache_alloc (vxfs_inode_cachep,GFP_KERNEL ))) goto fail; dip = (struct vxfs_dinode *)(kaddr + offset);memcpy (vip, dip,sizeof (*vip));
fs/hfsplus/super.c +1 -1
@@ -440,7 +440,7 @@ {struct hfsplus_inode_info *i; - i =kmem_cache_alloc (hfsplus_inode_cachep,SLAB_KERNEL ); + i =kmem_cache_alloc (hfsplus_inode_cachep,GFP_KERNEL );return i ? &i->vfs_inode :NULL ; }
fs/hugetlbfs/inode.c +1 -1
@@ -522,7 +522,7 @@if (unlikely (!hugetlbfs_dec_free_inodes (sbinfo)))return NULL ; - p =kmem_cache_alloc (hugetlbfs_inode_cachep,SLAB_KERNEL ); + p =kmem_cache_alloc (hugetlbfs_inode_cachep,GFP_KERNEL );if (unlikely (!p)) {hugetlbfs_inc_free_inodes (sbinfo);return NULL ;
fs/inode.c +1 -1
@@ -110,7 +110,7 @@if (sb->s_op->alloc_inode) inode = sb->s_op->alloc_inode (sb);else - inode = (struct inode *)kmem_cache_alloc (inode_cachep,SLAB_KERNEL ); + inode = (struct inode *)kmem_cache_alloc (inode_cachep,GFP_KERNEL );if (inode) {struct address_space *const mapping = &inode->i_data;
fs/openpromfs/inode.c +1 -1
@@ -336,7 +336,7 @@ {struct op_inode_info *oi; - oi =kmem_cache_alloc (op_inode_cachep,SLAB_KERNEL ); + oi =kmem_cache_alloc (op_inode_cachep,GFP_KERNEL );if (!oi)return NULL ;
include/linux/fs.h +1 -1
@@ -1543,7 +1543,7 @@extern struct kmem_cache *names_cachep; -#define __getname () kmem_cache_alloc(names_cachep, SLAB_KERNEL) +#define __getname () kmem_cache_alloc(names_cachep, GFP_KERNEL)#define __putname (name) kmem_cache_free(names_cachep, (void *)(name))#ifndef CONFIG_AUDITSYSCALL #define putname (name) __putname(name)
include/linux/rmap.h +1 -1
@@ -34,7 +34,7 @@static inline struct anon_vma *anon_vma_alloc (void ) { -return kmem_cache_alloc (anon_vma_cachep,SLAB_KERNEL ); +return kmem_cache_alloc (anon_vma_cachep,GFP_KERNEL ); }static inline void anon_vma_free (struct anon_vma *anon_vma)
include/linux/slab.h +0 -1
@@ -17,7 +17,6 @@#include <linux/types.h> /* flags for kmem_cache_alloc() */ -#define SLAB_KERNEL GFP_KERNEL#define SLAB_DMA GFP_DMA/* flags to pass to kmem_cache_create().
ipc/mqueue.c +1 -1
@@ -224,7 +224,7 @@ {struct mqueue_inode_info *ei; - ei =kmem_cache_alloc (mqueue_inode_cachep,SLAB_KERNEL ); + ei =kmem_cache_alloc (mqueue_inode_cachep,GFP_KERNEL );if (!ei)return NULL ;return &ei->vfs_inode;
kernel/delayacct.c +1 -1
@@ -41,7 +41,7 @@void __delayacct_tsk_init (struct task_struct *tsk) { - tsk->delays =kmem_cache_zalloc (delayacct_cache,SLAB_KERNEL ); + tsk->delays =kmem_cache_zalloc (delayacct_cache,GFP_KERNEL );if (tsk->delays)spin_lock_init (&tsk->delays->lock); }
kernel/taskstats.c +1 -1
@@ -436,7 +436,7 @@ goto ret;/* No problem if kmem_cache_zalloc() fails */ - stats =kmem_cache_zalloc (taskstats_cache,SLAB_KERNEL ); + stats =kmem_cache_zalloc (taskstats_cache,GFP_KERNEL );spin_lock_irq (&tsk->sighand->siglock);if (!sig->stats) {
kernel/fork.c +3 -3
@@ -238,7 +238,7 @@ goto fail_nomem; charge = len; } - tmp =kmem_cache_alloc (vm_area_cachep,SLAB_KERNEL ); + tmp =kmem_cache_alloc (vm_area_cachep,GFP_KERNEL );if (!tmp) goto fail_nomem; *tmp = *mpnt;
@@ -320,7 +320,7 @@__cacheline_aligned_in_smp DEFINE_SPINLOCK (mmlist_lock ); -#define allocate_mm () (kmem_cache_alloc(mm_cachep, SLAB_KERNEL)) +#define allocate_mm () (kmem_cache_alloc(mm_cachep, GFP_KERNEL))#define free_mm (mm) (kmem_cache_free(mm_cachep, (mm)))#include <linux/init_task.h>
@@ -631,7 +631,7 @@struct files_struct *newf;struct fdtable *fdt; - newf =kmem_cache_alloc (files_cachep,SLAB_KERNEL ); + newf =kmem_cache_alloc (files_cachep,GFP_KERNEL );if (!newf) goto out;
kernel/kevent/kevent_poll.c +2 -2
@@ -76,7 +76,7 @@struct kevent_poll_wait_container *cont;unsigned long flags; - cont =kmem_cache_alloc (kevent_poll_container_cache,SLAB_KERNEL ); + cont =kmem_cache_alloc (kevent_poll_container_cache,GFP_KERNEL );if (!cont) {kevent_break (k);return ;
@@ -110,7 +110,7 @@ goto err_out_fput; err = -ENOMEM ; - priv =kmem_cache_alloc (kevent_poll_priv_cache,SLAB_KERNEL ); + priv =kmem_cache_alloc (kevent_poll_priv_cache,GFP_KERNEL );if (!priv) goto err_out_fput;
kernel/user.c +1 -1
@@ -132,7 +132,7 @@if (!up) {struct user_struct *new; - new =kmem_cache_alloc (uid_cachep,SLAB_KERNEL ); + new =kmem_cache_alloc (uid_cachep,GFP_KERNEL );if (!new)return NULL ; new->uid = uid;
mm/shmem.c +1 -1
@@ -2263,7 +2263,7 @@static struct inode *shmem_alloc_inode (struct super_block *sb) {struct shmem_inode_info *p; - p = (struct shmem_inode_info *)kmem_cache_alloc (shmem_inode_cachep,SLAB_KERNEL ); + p = (struct shmem_inode_info *)kmem_cache_alloc (shmem_inode_cachep,GFP_KERNEL );if (!p)return NULL ;return &p->vfs_inode;
mm/mmap.c +2 -2
@@ -1736,7 +1736,7 @@if (mm->map_count >= sysctl_max_map_count)return -ENOMEM ; - new =kmem_cache_alloc (vm_area_cachep,SLAB_KERNEL ); + new =kmem_cache_alloc (vm_area_cachep,GFP_KERNEL );if (!new)return -ENOMEM ;
@@ -2057,7 +2057,7 @@ vma_start < new_vma->vm_end) *vmap = new_vma; }else { - new_vma =kmem_cache_alloc (vm_area_cachep,SLAB_KERNEL ); + new_vma =kmem_cache_alloc (vm_area_cachep,GFP_KERNEL );if (new_vma) { *new_vma = *vma; pol =mpol_copy (vma_policy (vma));
mm/slab.c +1 -1
@@ -2239,7 +2239,7 @@ align = ralign;/* Get cache's description obj. */ - cachep =kmem_cache_zalloc (&cache_cache,SLAB_KERNEL ); + cachep =kmem_cache_zalloc (&cache_cache,GFP_KERNEL );if (!cachep) goto oops;
mm/mempolicy.c +1 -1
@@ -1326,7 +1326,7 @@atomic_set (&new->refcnt,1 );if (new->policy ==MPOL_BIND ) {int sz =ksize (old->v.zonelist); - new->v.zonelist =kmemdup (old->v.zonelist, sz,SLAB_KERNEL ); + new->v.zonelist =kmemdup (old->v.zonelist, sz,GFP_KERNEL );if (!new->v.zonelist) {kmem_cache_free (policy_cache, new);return ERR_PTR (-ENOMEM );
net/ipv4/fib_hash.c +2 -2
@@ -485,13 +485,13 @@ goto out; err = -ENOBUFS ; - new_fa =kmem_cache_alloc (fn_alias_kmem,SLAB_KERNEL ); + new_fa =kmem_cache_alloc (fn_alias_kmem,GFP_KERNEL );if (new_fa ==NULL ) goto out; new_f =NULL ;if (!f) { - new_f =kmem_cache_alloc (fn_hash_kmem,SLAB_KERNEL ); + new_f =kmem_cache_alloc (fn_hash_kmem,GFP_KERNEL );if (new_f ==NULL ) goto out_free_new_fa;
net/ipv4/fib_trie.c +2 -2
@@ -1187,7 +1187,7 @@u8 state; err = -ENOBUFS ; - new_fa =kmem_cache_alloc (fn_alias_kmem,SLAB_KERNEL ); + new_fa =kmem_cache_alloc (fn_alias_kmem,GFP_KERNEL );if (new_fa ==NULL ) goto out;
@@ -1232,7 +1232,7 @@ goto out; err = -ENOBUFS ; - new_fa =kmem_cache_alloc (fn_alias_kmem,SLAB_KERNEL ); + new_fa =kmem_cache_alloc (fn_alias_kmem,GFP_KERNEL );if (new_fa ==NULL ) goto out;
net/decnet/dn_table.c +1 -1
@@ -590,7 +590,7 @@ replace: err = -ENOBUFS ; - new_f =kmem_cache_alloc (dn_hash_kmem,SLAB_KERNEL ); + new_f =kmem_cache_alloc (dn_hash_kmem,GFP_KERNEL );if (new_f ==NULL ) goto out;
net/sunrpc/rpc_pipe.c +1 -1
@@ -142,7 +142,7 @@ rpc_alloc_inode(struct super_block *sb) {struct rpc_inode *rpci; - rpci = (struct rpc_inode *)kmem_cache_alloc (rpc_inode_cachep,SLAB_KERNEL ); + rpci = (struct rpc_inode *)kmem_cache_alloc (rpc_inode_cachep,GFP_KERNEL );if (!rpci)return NULL ;return &rpci->vfs_inode;
net/socket.c +1 -1
@@ -237,7 +237,7 @@ {struct socket_alloc *ei; - ei =kmem_cache_alloc (sock_inode_cachep,SLAB_KERNEL ); + ei =kmem_cache_alloc (sock_inode_cachep,GFP_KERNEL );if (!ei)return NULL ;init_waitqueue_head (&ei->socket.wait);
security/keys/key.c +1 -1
@@ -285,7 +285,7 @@ }/* allocate and initialise the key and its description */ - key =kmem_cache_alloc (key_jar,SLAB_KERNEL ); + key =kmem_cache_alloc (key_jar,GFP_KERNEL );if (!key) goto no_memory_2;
security/selinux/ss/avtab.c +1 -1
@@ -36,7 +36,7 @@ struct avtab_key *key, struct avtab_datum *datum) { struct avtab_node * newnode; - newnode =kmem_cache_alloc (avtab_node_cachep,SLAB_KERNEL ); + newnode =kmem_cache_alloc (avtab_node_cachep,GFP_KERNEL );if (newnode ==NULL )return NULL ;memset (newnode,0 ,sizeof (struct avtab_node ));
security/selinux/hooks.c +1 -1
@@ -181,7 +181,7 @@struct task_security_struct *tsec = current->security;struct inode_security_struct *isec; - isec =kmem_cache_alloc (sel_inode_cache,SLAB_KERNEL ); + isec =kmem_cache_alloc (sel_inode_cache,GFP_KERNEL );if (!isec)return -ENOMEM ;
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH 8/8 Get rid of SLAB_DMA
In reply to Christoph LameterGet rid of SLAB_DMA
SLAB_DMA is an alias of GFP_DMA. This is the last one so we remove the leftover comment too.
drivers/atm/he.c +3 -3
@@ -820,7 +820,7 @@void *cpuaddr;#ifdef USE_RBPS_POOL - cpuaddr =pci_pool_alloc (he_dev->rbps_pool,GFP_KERNEL |SLAB_DMA , &dma_handle); + cpuaddr =pci_pool_alloc (he_dev->rbps_pool,GFP_KERNEL |GFP_DMA , &dma_handle);if (cpuaddr ==NULL )return -ENOMEM ;#else
@@ -884,7 +884,7 @@void *cpuaddr;#ifdef USE_RBPL_POOL - cpuaddr =pci_pool_alloc (he_dev->rbpl_pool,GFP_KERNEL |SLAB_DMA , &dma_handle); + cpuaddr =pci_pool_alloc (he_dev->rbpl_pool,GFP_KERNEL |GFP_DMA , &dma_handle);if (cpuaddr ==NULL )return -ENOMEM ;#else
@@ -1724,7 +1724,7 @@struct he_tpd *tpd;dma_addr_t dma_handle; - tpd =pci_pool_alloc (he_dev->tpd_pool,GFP_ATOMIC |SLAB_DMA , &dma_handle); + tpd =pci_pool_alloc (he_dev->tpd_pool,GFP_ATOMIC |GFP_DMA , &dma_handle);if (tpd ==NULL )return NULL ;
drivers/usb/core/buffer.c +1 -1
@@ -93,7 +93,7 @@ } -/* sometimes alloc/free could use kmalloc with SLAB_DMA, for +/* sometimes alloc/free could use kmalloc with GFP_DMA, for * better sharing and to leverage mm/slab.c intelligence. */
drivers/s390/block/dasd_eckd.c +1 -1
@@ -1215,7 +1215,7 @@ dst =page_address (bv->bv_page) + bv->bv_offset;if (dasd_page_cache) {char *copy =kmem_cache_alloc (dasd_page_cache, -SLAB_DMA | __GFP_NOWARN); +GFP_DMA | __GFP_NOWARN);if (copy &&rq_data_dir (req) ==WRITE )memcpy (copy + bv->bv_offset, dst, bv->bv_len);if (copy)
drivers/s390/block/dasd_fba.c +1 -1
@@ -308,7 +308,7 @@ dst =page_address (bv->bv_page) + bv->bv_offset;if (dasd_page_cache) {char *copy =kmem_cache_alloc (dasd_page_cache, -SLAB_DMA | __GFP_NOWARN); +GFP_DMA | __GFP_NOWARN);if (copy &&rq_data_dir (req) ==WRITE )memcpy (copy + bv->bv_offset, dst, bv->bv_len);if (copy)
include/linux/slab.h +0 -3
@@ -16,9 +16,6 @@#include <linux/init.h> #include <linux/types.h> -/* flags for kmem_cache_alloc() */ -#define SLAB_DMA GFP_DMA -/* flags to pass to kmem_cache_create(). * The first 3 are only valid when the allocator as been build * SLAB_DEBUG_SUPPORT.
mm/slab.c +2 -2
@@ -2640,7 +2640,7 @@static void kmem_flagcheck (struct kmem_cache *cachep,gfp_t flags) {if (CONFIG_ZONE_DMA_FLAG ) { -if (flags &SLAB_DMA ) +if (flags &GFP_DMA )BUG_ON (!(cachep->gfpflags &GFP_DMA ));else BUG_ON (cachep->gfpflags &GFP_DMA );
@@ -2725,7 +2725,7 @@* Be lazy and only check for valid flags here, keeping it out of the * critical path in kmem_cache_alloc(). */ -BUG_ON (flags & ~(SLAB_DMA |GFP_LEVEL_MASK | __GFP_NO_GROW)); +BUG_ON (flags & ~(GFP_DMA |GFP_LEVEL_MASK | __GFP_NO_GROW));if (flags & __GFP_NO_GROW)return 0 ;
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 2 lines · Christoph Lameter
This patchset removes all the aliases from
slab.hand also removes all occurrences.
Looks good!
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>