Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fea15437 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull debugobjects fix from Ingo Molnar:
 "A single commit making debugobjects interact better with kmemleak"

* 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  debugobjects: Make kmemleak ignore debug objects
parents 81a84ad3 caba4cbb

init/main.c

+1 −1
Original line number Diff line number Diff line
@@ -651,8 +651,8 @@ asmlinkage __visible void __init start_kernel(void) 
	}

#endif

	page_ext_init();

	debug_objects_mem_init();

	kmemleak_init();

	debug_objects_mem_init();

	setup_per_cpu_pageset();

	numa_policy_init();

	if (late_time_init)

lib/debugobjects.c

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/debugfs.h>

#include <linux/slab.h>

#include <linux/hash.h>

#include <linux/kmemleak.h>



#define ODEBUG_HASH_BITS	14

#define ODEBUG_HASH_SIZE	(1 << ODEBUG_HASH_BITS)
@@ -110,6 +111,7 @@ static void fill_pool(void) 
		if (!new)

			return;



		kmemleak_ignore(new);

		raw_spin_lock_irqsave(&pool_lock, flags);

		hlist_add_head(&new->node, &obj_pool);

		debug_objects_allocated++;
@@ -1080,6 +1082,7 @@ static int __init debug_objects_replace_static_objects(void) 
		obj = kmem_cache_zalloc(obj_cache, GFP_KERNEL);

		if (!obj)

			goto free;

		kmemleak_ignore(obj);

		hlist_add_head(&obj->node, &objects);

	}