diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-24 09:24:04 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-24 09:24:04 -0500 |
| commit | 11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e (patch) | |
| tree | b01421cb139b11065d776ed361a7a12b3a1aecc9 /mm/mempool.c | |
| parent | 54da9a3968448681d0ddf193ec90f2480c5cba1c (diff) | |
| parent | 2cc432eed0491df66e14b578139bba2c75fb3f9a (diff) | |
| download | talos-obmc-linux-11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e.tar.gz talos-obmc-linux-11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e.zip | |
Merge branch 'upstream'
Conflicts:
drivers/scsi/sata_vsc.c
Diffstat (limited to 'mm/mempool.c')
| -rw-r--r-- | mm/mempool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/mempool.c b/mm/mempool.c index 1a99b80480d3..f71893ed3543 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -278,14 +278,14 @@ EXPORT_SYMBOL(mempool_free); */ 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); } EXPORT_SYMBOL(mempool_alloc_slab); 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); } EXPORT_SYMBOL(mempool_free_slab); |
