From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 27 Oct 2008 09:50:54 +0000 (+0100)
Subject: Merge commit 'v2.6.28-rc2' into tracing/urgent
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4944dd62de21230af039eda7cd218e9a09021d11;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge commit 'v2.6.28-rc2' into tracing/urgent
---

4944dd62de21230af039eda7cd218e9a09021d11
diff --cc arch/x86/include/asm/ftrace.h
index 000000000000,47f7e65e6c1d..9e8bc29b8b17
mode 000000,100644..100644
--- a/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@@ -1,0 -1,24 +1,24 @@@
+ #ifndef _ASM_X86_FTRACE_H
+ #define _ASM_X86_FTRACE_H
+ 
 -#ifdef CONFIG_FTRACE
++#ifdef CONFIG_FUNCTION_TRACER
+ #define MCOUNT_ADDR		((long)(mcount))
+ #define MCOUNT_INSN_SIZE	5 /* sizeof mcount call */
+ 
+ #ifndef __ASSEMBLY__
+ extern void mcount(void);
+ 
+ static inline unsigned long ftrace_call_adjust(unsigned long addr)
+ {
+ 	/*
+ 	 * call mcount is "e8 <4 byte offset>"
+ 	 * The addr points to the 4 byte offset and the caller of this
+ 	 * function wants the pointer to e8. Simply subtract one.
+ 	 */
+ 	return addr - 1;
+ }
+ #endif
+ 
 -#endif /* CONFIG_FTRACE */
++#endif /* CONFIG_FUNCTION_TRACER */
+ 
+ #endif /* _ASM_X86_FTRACE_H */