From 8175d0f1a6911a1a34916f6cad8a7aad105d6f7a Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 14 Oct 2009 11:49:49 +0900 Subject: [PATCH] --- yaml --- r: 173404 b: refs/heads/master c: 36c871992697eaaf88a3682c2c3003a41c54b8c0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/include/asm/ftrace.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a28a844570eb..88a193359788 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4b053d96ae4e23e7023eb9f591bd7fc5c9c8cb9 +refs/heads/master: 36c871992697eaaf88a3682c2c3003a41c54b8c0 diff --git a/trunk/arch/sh/include/asm/ftrace.h b/trunk/arch/sh/include/asm/ftrace.h index 28875a3e4116..13e9966464c2 100644 --- a/trunk/arch/sh/include/asm/ftrace.h +++ b/trunk/arch/sh/include/asm/ftrace.h @@ -32,6 +32,11 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) return addr; } +#endif /* __ASSEMBLY__ */ +#endif /* CONFIG_FUNCTION_TRACER */ + +#ifndef __ASSEMBLY__ + /* arch/sh/kernel/return_address.c */ extern void *return_address(unsigned int); @@ -46,6 +51,5 @@ extern void *return_address(unsigned int); #define CALLER_ADDR6 ((unsigned long)return_address(6)) #endif /* __ASSEMBLY__ */ -#endif /* CONFIG_FUNCTION_TRACER */ #endif /* __ASM_SH_FTRACE_H */