summaryrefslogtreecommitdiffstats
path: root/mm/slub.c
diff options
context:
space:
mode:
authorChristoph Lameter2010-08-20 19:37:12 +0200
committerPekka Enberg2010-10-02 09:24:26 +0200
commit1537066c69bee9ebc4b998626c532ce1724d4e67 (patch)
tree914bc354a286b6e14cf8f69f831f4656d9a49636 /mm/slub.c
parentLinux 2.6.36-rc6 (diff)
downloadkernel-qcow2-linux-1537066c69bee9ebc4b998626c532ce1724d4e67.tar.gz
kernel-qcow2-linux-1537066c69bee9ebc4b998626c532ce1724d4e67.tar.xz
kernel-qcow2-linux-1537066c69bee9ebc4b998626c532ce1724d4e67.zip
slub: Force no inlining of debug functions
Compiler folds the debgging functions into the critical paths. Avoid that by adding noinline to the functions that check for problems. Acked-by: David Rientjes <rientjes@google.com> Signed-off-by: Christoph Lameter <cl@linux.com> Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'mm/slub.c')
-rw-r--r--mm/slub.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 13fffe1f0f3d..d28ee64bcdb5 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -862,7 +862,7 @@ static void setup_object_debug(struct kmem_cache *s, struct page *page,
init_tracking(s, object);
}
-static int alloc_debug_processing(struct kmem_cache *s, struct page *page,
+static noinline int alloc_debug_processing(struct kmem_cache *s, struct page *page,
void *object, unsigned long addr)
{
if (!check_slab(s, page))
@@ -902,8 +902,8 @@ bad:
return 0;
}
-static int free_debug_processing(struct kmem_cache *s, struct page *page,
- void *object, unsigned long addr)
+static noinline int free_debug_processing(struct kmem_cache *s,
+ struct page *page, void *object, unsigned long addr)
{
if (!check_slab(s, page))
goto fail;