Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm: kmemleak: Initialise kmemleak after debug_objects_mem_init() kmemleak: Select DEBUG_FS unconditionally in DEBUG_KMEMLEAK kmemleak: Do not return a pointer to an object that kmemleak did not get
This commit is contained in:
commit
83d7e94875
3 changed files with 7 additions and 4 deletions
|
@ -580,8 +580,8 @@ asmlinkage void __init start_kernel(void)
|
|||
#endif
|
||||
page_cgroup_init();
|
||||
enable_debug_pagealloc();
|
||||
kmemleak_init();
|
||||
debug_objects_mem_init();
|
||||
kmemleak_init();
|
||||
setup_per_cpu_pageset();
|
||||
numa_policy_init();
|
||||
if (late_time_init)
|
||||
|
|
|
@ -400,7 +400,7 @@ config DEBUG_KMEMLEAK
|
|||
depends on DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && \
|
||||
(X86 || ARM || PPC || MIPS || S390 || SPARC64 || SUPERH || MICROBLAZE || TILE)
|
||||
|
||||
select DEBUG_FS if SYSFS
|
||||
select DEBUG_FS
|
||||
select STACKTRACE if STACKTRACE_SUPPORT
|
||||
select KALLSYMS
|
||||
select CRC32
|
||||
|
|
|
@ -1414,9 +1414,12 @@ static void *kmemleak_seq_next(struct seq_file *seq, void *v, loff_t *pos)
|
|||
++(*pos);
|
||||
|
||||
list_for_each_continue_rcu(n, &object_list) {
|
||||
next_obj = list_entry(n, struct kmemleak_object, object_list);
|
||||
if (get_object(next_obj))
|
||||
struct kmemleak_object *obj =
|
||||
list_entry(n, struct kmemleak_object, object_list);
|
||||
if (get_object(obj)) {
|
||||
next_obj = obj;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
put_object(prev_obj);
|
||||
|
|
Loading…
Reference in a new issue