Merge branches 'x86/early-printk', 'x86/microcode' and 'core/objtool' into x86/urgent...

[sfrench/cifs-2.6.git] / arch / arm / include / asm / ftrace.h

diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
index 9e842ff41768c35db80093d6a9b8532aa2d43e88..18b0197f23848906e8495c563638ef3179abb06f 100644 (file)
--- a/arch/arm/include/asm/ftrace.h
+++ b/arch/arm/include/asm/ftrace.h
@@ -16,9 +16,6 @@ extern void __gnu_mcount_nc(void);
 
 #ifdef CONFIG_DYNAMIC_FTRACE
 struct dyn_arch_ftrace {
-#ifdef CONFIG_OLD_MCOUNT
-       bool    old_mcount;
-#endif
 };
 
 static inline unsigned long ftrace_call_adjust(unsigned long addr)