diff options
| author | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 09:50:49 -0400 |
|---|---|---|
| committer | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 09:50:49 -0400 |
| commit | 722f2a6c87f34ee0fd0130a8cf45f81e0705594a (patch) | |
| tree | 50b054df34d2731eb0ba0cf1a6c27e43e7eed428 /include/linux/slab.h | |
| parent | 7a0aeb14e18ad59394bd9bbc6e57fb345819e748 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge commit 'linus/master' into HEAD
Conflicts:
MAINTAINERS
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Diffstat (limited to 'include/linux/slab.h')
| -rw-r--r-- | include/linux/slab.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index e339fcf17cd3..2da8372519f5 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h | |||
| @@ -326,4 +326,6 @@ static inline void *kzalloc_node(size_t size, gfp_t flags, int node) | |||
| 326 | return kmalloc_node(size, flags | __GFP_ZERO, node); | 326 | return kmalloc_node(size, flags | __GFP_ZERO, node); |
| 327 | } | 327 | } |
| 328 | 328 | ||
| 329 | void __init kmem_cache_init_late(void); | ||
| 330 | |||
| 329 | #endif /* _LINUX_SLAB_H */ | 331 | #endif /* _LINUX_SLAB_H */ |