diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 04:38:52 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 04:38:52 +0400 |
| commit | bb193c986a7104f718c1b92709e1e6e22ac3f864 (patch) | |
| tree | 1d5a1b08e31a8e39ec4688afd24695c0c6a113ae /include/linux/slob_def.h | |
| parent | f65ac45e20b03081ed64f41ce91bb982f8ac258d (diff) | |
| parent | aceda773606f2506a25b91aaafae87b2e4315834 (diff) | |
| download | linux-bb193c986a7104f718c1b92709e1e6e22ac3f864.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: fix slab_pad_check()
slub: release kobject if sysfs_create_group failed in sysfs_slab_add
SLUB: fix ARCH_KMALLOC_MINALIGN cases 64 and 256
SLUB: Fix some coding style issues
SLUB: Drop write permission to /proc/slabinfo
slab: remove duplicate kmem_cache_init_late() declarations
slub: change kmem_cache->align to record the real alignment
slub: use size and objsize orders to disable debug flags
slub: add option to disable higher order debugging slabs
Diffstat (limited to 'include/linux/slob_def.h')
| -rw-r--r-- | include/linux/slob_def.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h index bb5368df4be8..0ec00b39d006 100644 --- a/include/linux/slob_def.h +++ b/include/linux/slob_def.h @@ -34,9 +34,4 @@ static __always_inline void *__kmalloc(size_t size, gfp_t flags) return kmalloc(size, flags); } -static inline void kmem_cache_init_late(void) -{ - /* Nothing to do */ -} - #endif /* __LINUX_SLOB_DEF_H */ |