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: 4336261 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2DE6DBEEAA for ; Wed, 11 Jun 2014 13:26:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 63EFB201F5 for ; Wed, 11 Jun 2014 13:26:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3AC56201E4 for ; Wed, 11 Jun 2014 13:26:55 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WuiVS-0008To-KR; Wed, 11 Jun 2014 13:23:58 +0000 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.229] helo=cdptpa-oedge-vip.email.rr.com) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WuiVP-0008Sh-TW for linux-arm-kernel@lists.infradead.org; Wed, 11 Jun 2014 13:23:57 +0000 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140611_062356_037841_95B560CF X-CRM114-Status: UNSURE ( 7.83 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: linaro-kernel , dsaxena@linaro.org, Linux-sh list , Catalin Marinas , tim.bird@sonymobile.com, arndb@arndb.de, "linux-kernel@vger.kernel.org" , AKASHI Takahiro , Ingo Molnar , Geert Uytterhoeven , =?UTF-8?B?RnLDqWTDqXJpYw==?= Weisbecker , gkulkarni@caviumnetworks.com, "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 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__ */