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-Tag: v2.6.28-rc3~86^2~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4944dd62de21230af039eda7cd218e9a09021d11;p=linux-2.6-omap-h63xx.git

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

4944dd62de21230af039eda7cd218e9a09021d11
diff --cc arch/x86/include/asm/ftrace.h
index 233bb9b869c,47f7e65e6c1..9e8bc29b8b1
--- a/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@@ -1,7 -1,7 +1,7 @@@
- #ifndef ASM_X86__FTRACE_H
- #define ASM_X86__FTRACE_H
+ #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 */
  
@@@ -19,6 -19,6 +19,6 @@@ static inline unsigned long ftrace_call
  }
  #endif
  
 -#endif /* CONFIG_FTRACE */
 +#endif /* CONFIG_FUNCTION_TRACER */
  
- #endif /* ASM_X86__FTRACE_H */
+ #endif /* _ASM_X86_FTRACE_H */