From patchwork Fri Feb 21 02:22:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Behan Webster X-Patchwork-Id: 25094 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 33C23201EE for ; Fri, 21 Feb 2014 02:24:00 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id g12sf11324787oah.10 for ; Thu, 20 Feb 2014 18:23:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=SbkbyR/krROeupUJaVuLq0klBssUJb3HwEeHBUP2BB4=; b=fdipMeHJAZh3EXxmwCr1nqmh3LRI5g3QF87P+b34VmMNdM+/44R2l0ZykD+w4CBnNx yar3Ql6kk8JVNwmPDrcDkTsSGhnpFcYvnUvxhXCx+yZ8YgBUmmyp5zh+D5x99a6d/he1 sWRcdNWif0ziLrykijVAz9TPabvRRvOinCOj5eHPfRHeZ8FLnH/i5glt3zU6nTszXXVC rse+MppWK6z7zCIo6NsyPnIIt6icWCh9J+B70TimoZemWUsKOkef4Ec3bC3eYKr+FmIv US7GCfY1OZclR0TNxSbb5RE/SxDSHxi+THjvtT5t5WQHt5nSL4chnTHUtj6ns0e3ltxQ fhLw== X-Gm-Message-State: ALoCoQlY34DNYoyPX4bNacBArpXZQXZ9jeM/ZVW1nCTNksVKeS0ejErPPSZsIvFsWA6o4//EE2wG X-Received: by 10.42.235.132 with SMTP id kg4mr2153943icb.32.1392949439696; Thu, 20 Feb 2014 18:23:59 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.138 with SMTP id k10ls792332qge.66.gmail; Thu, 20 Feb 2014 18:23:59 -0800 (PST) X-Received: by 10.52.156.232 with SMTP id wh8mr2632207vdb.23.1392949439561; Thu, 20 Feb 2014 18:23:59 -0800 (PST) Received: from mail-ve0-x234.google.com (mail-ve0-x234.google.com [2607:f8b0:400c:c01::234]) by mx.google.com with ESMTPS id eo4si2383873vdb.4.2014.02.20.18.23.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Feb 2014 18:23:59 -0800 (PST) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::234 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::234; Received: by mail-ve0-f180.google.com with SMTP id cz12so1427726veb.25 for ; Thu, 20 Feb 2014 18:23:59 -0800 (PST) X-Received: by 10.220.106.84 with SMTP id w20mr3210532vco.18.1392949439326; Thu, 20 Feb 2014 18:23:59 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp105792vcz; Thu, 20 Feb 2014 18:23:58 -0800 (PST) X-Received: by 10.68.137.67 with SMTP id qg3mr6256448pbb.6.1392949438493; Thu, 20 Feb 2014 18:23:58 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o7si5503118pbh.212.2014.02.20.18.23.57; Thu, 20 Feb 2014 18:23:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752886AbaBUCXt (ORCPT + 26 others); Thu, 20 Feb 2014 21:23:49 -0500 Received: from mail-pa0-f53.google.com ([209.85.220.53]:51732 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752771AbaBUCXq (ORCPT ); Thu, 20 Feb 2014 21:23:46 -0500 Received: by mail-pa0-f53.google.com with SMTP id lj1so2793035pab.40 for ; Thu, 20 Feb 2014 18:23:46 -0800 (PST) X-Received: by 10.68.228.138 with SMTP id si10mr6070851pbc.13.1392949426185; Thu, 20 Feb 2014 18:23:46 -0800 (PST) Received: from galdor.websterwood.com ([207.6.123.58]) by mx.google.com with ESMTPSA id yh4sm15864549pbb.19.2014.02.20.18.23.43 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Feb 2014 18:23:45 -0800 (PST) From: behanw@converseincode.com To: rostedt@goodmis.org, fweisbec@gmail.com, mingo@redhat.com, linux@arm.linux.org.uk, kpark3469@gmail.com Cc: keun-o.park@windriver.com, dave.martin@linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Behan Webster Subject: [PATCH] arm: LLVMLinux: use static inline in ARM ftrace.h Date: Thu, 20 Feb 2014 18:22:50 -0800 Message-Id: <1392949370-26422-1-git-send-email-behanw@converseincode.com> X-Mailer: git-send-email 1.8.3.2 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Original-Sender: behanw@converseincode.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::234 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (bad format) header.i=@converseincode.com Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Behan Webster With compilers which follow the C99 standard (like modern versions of gcc and clang), "extern inline" does the wrong thing (emits code for an externally linkable version of the inline function). In this case using static inline and removing the NULL version of return_address in return_address.c does the right thing. Signed-off-by: Behan Webster Reviewed-by: Mark Charlebois Acked-by: Steven Rostedt --- arch/arm/include/asm/ftrace.h | 2 +- arch/arm/kernel/return_address.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h index f89515a..2bb8cac 100644 --- a/arch/arm/include/asm/ftrace.h +++ b/arch/arm/include/asm/ftrace.h @@ -45,7 +45,7 @@ void *return_address(unsigned int); #else -extern inline void *return_address(unsigned int level) +static inline void *return_address(unsigned int level) { return NULL; } diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c index fafedd8..f6aa84d 100644 --- a/arch/arm/kernel/return_address.c +++ b/arch/arm/kernel/return_address.c @@ -63,11 +63,6 @@ void *return_address(unsigned int level) #warning "TODO: return_address should use unwind tables" #endif -void *return_address(unsigned int level) -{ - return NULL; -} - #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */ EXPORT_SYMBOL_GPL(return_address);