diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-27 07:47:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-27 07:47:34 +0200 |
| commit | 003263f45b8aa5466afe0209f75a077c50e8f477 (patch) | |
| tree | 7103d7f23e88fcdc301928bb157f6ef595c31c21 /include/linux/slab_def.h | |
| parent | 12f50da2e1ad0cda2fb5754298bd03b3b02eb78b (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
Merge branch 'linus' into kmemcheck
Conflicts:
init/main.c
mm/slab.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/slab_def.h')
| -rw-r--r-- | include/linux/slab_def.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h index 37b483754d14..7905c34a9c24 100644 --- a/include/linux/slab_def.h +++ b/include/linux/slab_def.h @@ -50,7 +50,7 @@ struct kmem_cache { unsigned int dflags; /* dynamic flags */ /* constructor func */ - void (*ctor)(struct kmem_cache *, void *); + void (*ctor)(void *obj); /* 5) cache creation/removal */ const char *name; |