From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Rostedt Date: Wed, 11 Jun 2014 13:23:30 +0000 Subject: [PATCH] arm/ftrace: Fix function_return_addr() to function_return_address() Message-Id: <20140611092330.7930eff2@gandalf.local.home> List-Id: References: <1394862048-28758-1-git-send-email-takahiro.akashi@linaro.org> <1398851676-16389-1-git-send-email-takahiro.akashi@linaro.org> <1398851676-16389-2-git-send-email-takahiro.akashi@linaro.org> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arm-kernel@lists.infradead.org The clean up of CALLER_ADDR*() functions required the archs to either use the default __builtin_return_address(X) (where X > 0) or override it with something the arch can use. To override it, the arch would define function_return_address(x). The arm architecture requires this to be redefined but instead of defining function_return_address(x) it defined function_return_addr(x). Reported-by: Geert Uytterhoeven Signed-off-by: Steven Rostedt ---- diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h index eb577f4..39eb16b 100644 --- a/arch/arm/include/asm/ftrace.h +++ b/arch/arm/include/asm/ftrace.h @@ -52,7 +52,7 @@ extern inline void *return_address(unsigned int level) #endif -#define ftrace_return_addr(n) return_address(n) +#define ftrace_return_address(n) return_address(n) #endif /* ifndef __ASSEMBLY__ */ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755426AbaFKNXf (ORCPT ); Wed, 11 Jun 2014 09:23:35 -0400 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.228]:48925 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751965AbaFKNXd (ORCPT ); Wed, 11 Jun 2014 09:23:33 -0400 Date: Wed, 11 Jun 2014 09:23:30 -0400 From: Steven Rostedt To: Will Deacon Cc: Geert Uytterhoeven , AKASHI Takahiro , =?UTF-8?B?RnLDqWTDqXJpYw==?= Weisbecker , Ingo Molnar , Catalin Marinas , tim.bird@sonymobile.com, gkulkarni@caviumnetworks.com, dsaxena@linaro.org, arndb@arndb.de, "linux-arm-kernel@lists.infradead.org" , linaro-kernel , "linux-kernel@vger.kernel.org" , Linux-sh list Subject: [PATCH] arm/ftrace: Fix function_return_addr() to function_return_address() Message-ID: <20140611092330.7930eff2@gandalf.local.home> In-Reply-To: References: <1394862048-28758-1-git-send-email-takahiro.akashi@linaro.org> <1398851676-16389-1-git-send-email-takahiro.akashi@linaro.org> <1398851676-16389-2-git-send-email-takahiro.akashi@linaro.org> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-RR-Connecting-IP: 107.14.168.130:25 X-Cloudmark-Score: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The clean up of CALLER_ADDR*() functions required the archs to either use the default __builtin_return_address(X) (where X > 0) or override it with something the arch can use. To override it, the arch would define function_return_address(x). The arm architecture requires this to be redefined but instead of defining function_return_address(x) it defined function_return_addr(x). Reported-by: Geert Uytterhoeven Signed-off-by: Steven Rostedt ---- diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h index eb577f4..39eb16b 100644 --- a/arch/arm/include/asm/ftrace.h +++ b/arch/arm/include/asm/ftrace.h @@ -52,7 +52,7 @@ extern inline void *return_address(unsigned int level) #endif -#define ftrace_return_addr(n) return_address(n) +#define ftrace_return_address(n) return_address(n) #endif /* ifndef __ASSEMBLY__ */ From mboxrd@z Thu Jan 1 00:00:00 1970 From: rostedt@goodmis.org (Steven Rostedt) Date: Wed, 11 Jun 2014 09:23:30 -0400 Subject: [PATCH] arm/ftrace: Fix function_return_addr() to function_return_address() In-Reply-To: References: <1394862048-28758-1-git-send-email-takahiro.akashi@linaro.org> <1398851676-16389-1-git-send-email-takahiro.akashi@linaro.org> <1398851676-16389-2-git-send-email-takahiro.akashi@linaro.org> Message-ID: <20140611092330.7930eff2@gandalf.local.home> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org The clean up of CALLER_ADDR*() functions required the archs to either use the default __builtin_return_address(X) (where X > 0) or override it with something the arch can use. To override it, the arch would define function_return_address(x). The arm architecture requires this to be redefined but instead of defining function_return_address(x) it defined function_return_addr(x). Reported-by: Geert Uytterhoeven Signed-off-by: Steven Rostedt ---- diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h index eb577f4..39eb16b 100644 --- a/arch/arm/include/asm/ftrace.h +++ b/arch/arm/include/asm/ftrace.h @@ -52,7 +52,7 @@ extern inline void *return_address(unsigned int level) #endif -#define ftrace_return_addr(n) return_address(n) +#define ftrace_return_address(n) return_address(n) #endif /* ifndef __ASSEMBLY__ */