diff options
| author | Anton Blanchard <anton@samba.org> | 2003-02-09 21:51:36 +1100 |
|---|---|---|
| committer | Anton Blanchard <anton@samba.org> | 2003-02-09 21:51:36 +1100 |
| commit | 5454267b5bea331ba3ffb59ea1a38e59a4fcd971 (patch) | |
| tree | b2f9440480ee0b0d15cc26459889db292a1fb873 /include/linux/slab.h | |
| parent | 6d4c02fa9f1b6a0e1ce07c5a8973ad86d29a62b1 (diff) | |
| parent | 03e218313940d2948c2b72df2710e193e42acca5 (diff) | |
resolve conflicts
Diffstat (limited to 'include/linux/slab.h')
| -rw-r--r-- | include/linux/slab.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index 220a672af798..c136265fd3cd 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -71,7 +71,8 @@ extern kmem_cache_t *files_cachep; extern kmem_cache_t *filp_cachep; extern kmem_cache_t *dquot_cachep; extern kmem_cache_t *fs_cachep; -extern kmem_cache_t *sigact_cachep; +extern kmem_cache_t *signal_cachep; +extern kmem_cache_t *sighand_cachep; extern kmem_cache_t *bio_cachep; #endif /* __KERNEL__ */ |