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

Merge branch 'auto-ftrace-next' into tracing/for-linus

Browse Source 
Conflicts:

	arch/x86/kernel/entry_32.S
	arch/x86/kernel/process_32.c
	arch/x86/kernel/process_64.c
	arch/x86/lib/Makefile
	include/asm-x86/irqflags.h
	kernel/Makefile
	kernel/sched.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2008-07-14 16:11:52 +02:00
parent d14c8a680c 6712e299b7
commit 5806b81ac1
100 changed files with 11490 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/linkage.h
View File

@@ -4,6 +4,8 @@
#include <linux/compiler.h>
#include <asm/linkage.h>
#define notrace __attribute__((no_instrument_function))
#ifdef __cplusplus
#define CPP_ASMLINKAGE extern "C"
#else