diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 21:38:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 21:38:13 -0400 |
| commit | 9a79b2274186fade17134929d4f85b70d59a3840 (patch) | |
| tree | d74e9ecc83ef617166445501b49087726595fb63 /arch/arm | |
| parent | 75473c1d3930896bbabcc99bb58fafd53ef42473 (diff) | |
| parent | 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (diff) | |
Merge branch 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
mm: Remove slab destructors from kmem_cache_create().
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/plat-s3c24xx/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c index 08d80f2f51f2..6d048490c559 100644 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c | |||
| @@ -1333,7 +1333,7 @@ int __init s3c24xx_dma_init(unsigned int channels, unsigned int irq, | |||
| 1333 | dma_kmem = kmem_cache_create("dma_desc", | 1333 | dma_kmem = kmem_cache_create("dma_desc", |
| 1334 | sizeof(struct s3c2410_dma_buf), 0, | 1334 | sizeof(struct s3c2410_dma_buf), 0, |
| 1335 | SLAB_HWCACHE_ALIGN, | 1335 | SLAB_HWCACHE_ALIGN, |
| 1336 | s3c2410_dma_cache_ctor, NULL); | 1336 | s3c2410_dma_cache_ctor); |
| 1337 | 1337 | ||
| 1338 | if (dma_kmem == NULL) { | 1338 | if (dma_kmem == NULL) { |
| 1339 | printk(KERN_ERR "dma failed to make kmem cache\n"); | 1339 | printk(KERN_ERR "dma failed to make kmem cache\n"); |