aboutsummaryrefslogtreecommitdiff
path: root/mm/slob.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-14 17:38:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-14 17:38:52 -0700
commitbb193c986a7104f718c1b92709e1e6e22ac3f864 (patch)
tree1d5a1b08e31a8e39ec4688afd24695c0c6a113ae /mm/slob.c
parentf65ac45e20b03081ed64f41ce91bb982f8ac258d (diff)
parentaceda773606f2506a25b91aaafae87b2e4315834 (diff)
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 'mm/slob.c')
-rw-r--r--mm/slob.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/slob.c b/mm/slob.c
index 9641da3d5e5..837ebd64cc3 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -692,3 +692,8 @@ void __init kmem_cache_init(void)
{
slob_ready = 1;
}
+
+void __init kmem_cache_init_late(void)
+{
+ /* Nothing to do */
+}