From patchwork Wed Jun 11 13:23:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 4336251 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 388FE9F357 for ; Wed, 11 Jun 2014 13:24:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 52B9B201F5 for ; Wed, 11 Jun 2014 13:24:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A4D7201E4 for ; Wed, 11 Jun 2014 13:24:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932348AbaFKNYf (ORCPT ); Wed, 11 Jun 2014 09:24:35 -0400 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.226]:38359 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932143AbaFKNYe (ORCPT ); Wed, 11 Jun 2014 09:24:34 -0400 Received: from [67.246.153.56] ([67.246.153.56:52576] helo=gandalf.local.home) by cdptpa-oedge02 (envelope-from ) (ecelerity 3.5.0.35861 r(Momo-dev:tip)) with ESMTP id 51/51-24736-35858935; Wed, 11 Jun 2014 13:23:32 +0000 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 X-RR-Connecting-IP: 107.14.168.130:25 X-Cloudmark-Score: 0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 ---- Tested-by: Geert Uytterhoeven --- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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__ */