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 /net/rxrpc/af_rxrpc.c | |
| 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 'net/rxrpc/af_rxrpc.c')
| -rw-r--r-- | net/rxrpc/af_rxrpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c index 46f6d572ad2d..16a68df4e36b 100644 --- a/net/rxrpc/af_rxrpc.c +++ b/net/rxrpc/af_rxrpc.c | |||
| @@ -792,7 +792,7 @@ static int __init af_rxrpc_init(void) | |||
| 792 | ret = -ENOMEM; | 792 | ret = -ENOMEM; |
| 793 | rxrpc_call_jar = kmem_cache_create( | 793 | rxrpc_call_jar = kmem_cache_create( |
| 794 | "rxrpc_call_jar", sizeof(struct rxrpc_call), 0, | 794 | "rxrpc_call_jar", sizeof(struct rxrpc_call), 0, |
| 795 | SLAB_HWCACHE_ALIGN, NULL, NULL); | 795 | SLAB_HWCACHE_ALIGN, NULL); |
| 796 | if (!rxrpc_call_jar) { | 796 | if (!rxrpc_call_jar) { |
| 797 | printk(KERN_NOTICE "RxRPC: Failed to allocate call jar\n"); | 797 | printk(KERN_NOTICE "RxRPC: Failed to allocate call jar\n"); |
| 798 | goto error_call_jar; | 798 | goto error_call_jar; |