From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 27 Nov 2008 02:04:43 +0000 (+0900)
Subject: sh: Provide a dyn_arch_ftrace struct definition.
X-Git-Tag: v2.6.29-rc1~591^2~87
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=22f131aa8de7a534339bf7051680234462f2e877;p=linux-2.6-omap-h63xx.git

sh: Provide a dyn_arch_ftrace struct definition.

Needed for dynamic ftrace API changes.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/include/asm/ftrace.h b/arch/sh/include/asm/ftrace.h
index 4cb5dbfc404..8fea7d8c825 100644
--- a/arch/sh/include/asm/ftrace.h
+++ b/arch/sh/include/asm/ftrace.h
@@ -15,15 +15,20 @@ extern void mcount(void);
 #define STUB_ADDR		((long)(ftrace_stub))
 
 #define MCOUNT_INSN_OFFSET	((STUB_ADDR - CALLER_ADDR) >> 1)
-#endif
+
+struct dyn_arch_ftrace {
+	/* No extra data needed on sh */
+};
+
+#endif /* CONFIG_DYNAMIC_FTRACE */
 
 static inline unsigned long ftrace_call_adjust(unsigned long addr)
 {
 	/* 'addr' is the memory table address. */
 	return addr;
 }
-#endif
 
+#endif /* __ASSEMBLY__ */
 #endif /* CONFIG_FUNCTION_TRACER */
 
 #endif /* __ASM_SH_FTRACE_H */