lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86/core' into tracing/textedit

Browse Source 
Conflicts:
	arch/x86/Kconfig
	block/blktrace.c
	kernel/irq/handle.c

Semantic conflict:
	kernel/trace/blktrace.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-03-06 16:44:14 +01:00
parent 1609743970 31bbed527e
commit f0ef039851
517 changed files with 19264 additions and 18627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/dumpstack.c
View File

@@ -101,7 +101,7 @@ print_context_stack(struct thread_info *tinfo,
frame = frame->next_frame;
bp = (unsigned long) frame;
} else {
ops->address(data, addr, bp == 0);
ops->address(data, addr, 0);
}
print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
}