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

Commit fcc234f8 authored by Pekka Enberg's avatar Pekka Enberg Committed by Linus Torvalds
Browse files

[PATCH] mm: kill kmem_cache_t usage 



We have struct kmem_cache now so use it instead of the old typedef.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b5d8ca7c

mm/mempolicy.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -98,8 +98,8 @@ 
/* The number of pages to migrate per call to migrate_pages() */

/* The number of pages to migrate per call to migrate_pages() */

#define MIGRATE_CHUNK_SIZE 256

#define MIGRATE_CHUNK_SIZE 256





static kmem_cache_t *policy_cache;

static struct kmem_cache *policy_cache;

static kmem_cache_t *sn_cache;

static struct kmem_cache *sn_cache;





#define PDprintk(fmt...)

#define PDprintk(fmt...)

mm/mempool.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -278,14 +278,14 @@ EXPORT_SYMBOL(mempool_free); 
 */

 */

void *mempool_alloc_slab(gfp_t gfp_mask, void *pool_data)

void *mempool_alloc_slab(gfp_t gfp_mask, void *pool_data)

{

{

	kmem_cache_t *mem = (kmem_cache_t *) pool_data;

	struct kmem_cache *mem = pool_data;

	return kmem_cache_alloc(mem, gfp_mask);

	return kmem_cache_alloc(mem, gfp_mask);

}

}

EXPORT_SYMBOL(mempool_alloc_slab);

EXPORT_SYMBOL(mempool_alloc_slab);





void mempool_free_slab(void *element, void *pool_data)

void mempool_free_slab(void *element, void *pool_data)

{

{

	kmem_cache_t *mem = (kmem_cache_t *) pool_data;

	struct kmem_cache *mem = pool_data;

	kmem_cache_free(mem, element);

	kmem_cache_free(mem, element);

}

}

EXPORT_SYMBOL(mempool_free_slab);
 
EXPORT_SYMBOL(mempool_free_slab);

mm/rmap.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ 




//#define RMAP_DEBUG /* can be enabled only for debugging */

//#define RMAP_DEBUG /* can be enabled only for debugging */





kmem_cache_t *anon_vma_cachep;

struct kmem_cache *anon_vma_cachep;





static inline void validate_anon_vma(struct vm_area_struct *find_vma)

static inline void validate_anon_vma(struct vm_area_struct *find_vma)

{

{
@@ -166,7 +166,8 @@ void anon_vma_unlink(struct vm_area_struct *vma) 
		anon_vma_free(anon_vma);

		anon_vma_free(anon_vma);

}

}





static void anon_vma_ctor(void *data, kmem_cache_t *cachep, unsigned long flags)

static void anon_vma_ctor(void *data, struct kmem_cache *cachep,

			  unsigned long flags)

{

{

	if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==

	if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==

						SLAB_CTOR_CONSTRUCTOR) {

						SLAB_CTOR_CONSTRUCTOR) {

mm/shmem.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -2119,7 +2119,7 @@ failed: 
	return err;

	return err;

}

}





static kmem_cache_t *shmem_inode_cachep;

static struct kmem_cache *shmem_inode_cachep;





static struct inode *shmem_alloc_inode(struct super_block *sb)

static struct inode *shmem_alloc_inode(struct super_block *sb)

{

{
@@ -2139,7 +2139,8 @@ static void shmem_destroy_inode(struct inode *inode) 
	kmem_cache_free(shmem_inode_cachep, SHMEM_I(inode));

	kmem_cache_free(shmem_inode_cachep, SHMEM_I(inode));

}

}





static void init_once(void *foo, kmem_cache_t *cachep, unsigned long flags)

static void init_once(void *foo, struct kmem_cache *cachep,

		      unsigned long flags)

{

{

	struct shmem_inode_info *p = (struct shmem_inode_info *) foo;

	struct shmem_inode_info *p = (struct shmem_inode_info *) foo;