From patchwork Sat Mar 22 08:24:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Behan Webster X-Patchwork-Id: 26895 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 324DC206A6 for ; Sat, 22 Mar 2014 08:25:11 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id x10sf7998650pdj.2 for ; Sat, 22 Mar 2014 01:25:10 -0700 (PDT) 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=KjCOQcqzCjlDRWNG1EN7iL0IGey2/fzfIOQC7LKnde8=; b=WtvRVsCcOgeD7kMdW5eSVsEWBYVt0W+HWucubIzObo4qAzU/uH6Gas3xlAigKNyql0 6jXdGd9UbyszpydaTJvLVy7IjgS2/qO+R/IsMN81LO02xfzDHFm0cMfm9DUYbu+q0Js0 t+RcqO1FuMTQuagV5dOqL6Fs0ZHYGCIPBZ/Xt8cEBwOK5jPi8LLHjpLGbBaFYc3+XQbo rUwvUdo67VzmiPRp9fBpVVrQIFhb84U9H+zu1o4PJM3qk5qSrFYaURlAcRY5Ggyw3Ox/ a4BjBzpOHAuK0S9SG1XRnO8NWwe+5O9H3zW9EQ1ztS49O1f11ghduAJSIbsJTcrr1dDb XM8w== X-Gm-Message-State: ALoCoQnU6ppBZ0skNA28g997Ryyi4vsvit1WdOuN7dqV9Uuc3s1J/maGb5MOrL7EncTraf3fsFkw X-Received: by 10.66.140.8 with SMTP id rc8mr21520210pab.41.1395476710033; Sat, 22 Mar 2014 01:25:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.137 with SMTP id l9ls886873qgf.40.gmail; Sat, 22 Mar 2014 01:25:09 -0700 (PDT) X-Received: by 10.52.119.197 with SMTP id kw5mr34846463vdb.5.1395476709916; Sat, 22 Mar 2014 01:25:09 -0700 (PDT) Received: from mail-ve0-x234.google.com (mail-ve0-x234.google.com [2607:f8b0:400c:c01::234]) by mx.google.com with ESMTPS id z15si1689129vce.72.2014.03.22.01.25.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 22 Mar 2014 01:25:09 -0700 (PDT) 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 jz11so3645333veb.11 for ; Sat, 22 Mar 2014 01:25:09 -0700 (PDT) X-Received: by 10.220.114.135 with SMTP id e7mr23852799vcq.23.1395476709692; Sat, 22 Mar 2014 01:25:09 -0700 (PDT) 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.78.9 with SMTP id i9csp85551vck; Sat, 22 Mar 2014 01:25:09 -0700 (PDT) X-Received: by 10.66.250.202 with SMTP id ze10mr1381870pac.153.1395476708868; Sat, 22 Mar 2014 01:25:08 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ha5si5168369pbc.129.2014.03.22.01.25.08; Sat, 22 Mar 2014 01:25:08 -0700 (PDT) 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 S1751322AbaCVIZA (ORCPT + 26 others); Sat, 22 Mar 2014 04:25:00 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:42793 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751284AbaCVIY4 (ORCPT ); Sat, 22 Mar 2014 04:24:56 -0400 Received: by mail-pa0-f51.google.com with SMTP id kq14so3363211pab.38 for ; Sat, 22 Mar 2014 01:24:56 -0700 (PDT) X-Received: by 10.68.218.3 with SMTP id pc3mr59462648pbc.71.1395476696442; Sat, 22 Mar 2014 01:24:56 -0700 (PDT) Received: from localhost.localdomain ([75.148.49.89]) by mx.google.com with ESMTPSA id vb7sm14251754pbc.13.2014.03.22.01.24.54 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 22 Mar 2014 01:24:55 -0700 (PDT) From: behanw@converseincode.com To: linux@arm.linux.org.uk, catalin.marinas@arm.com, will.deacon@arm.com Cc: u.kleine-koenig@pengutronix.de, jonathan.austin@arm.com, gerg@uclinux.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, dwmw2@infradead.org, pageexec@freemail.hu, Behan Webster Subject: [PATCH] ARM: LLVMLinux: Change "extern inline" to "static inline" in glue-cache.h Date: Sat, 22 Mar 2014 01:24:51 -0700 Message-Id: <1395476691-23040-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 (no key for signature) 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). "static inline" is the correct choice instead. Author: Behan Webster Signed-off-by: Behan Webster Reviewed-by: Mark Charlebois --- arch/arm/include/asm/glue-cache.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h index c81adc0..a3c24cd 100644 --- a/arch/arm/include/asm/glue-cache.h +++ b/arch/arm/include/asm/glue-cache.h @@ -130,22 +130,22 @@ #endif #ifndef __ASSEMBLER__ -extern inline void nop_flush_icache_all(void) { } -extern inline void nop_flush_kern_cache_all(void) { } -extern inline void nop_flush_kern_cache_louis(void) { } -extern inline void nop_flush_user_cache_all(void) { } -extern inline void nop_flush_user_cache_range(unsigned long a, +static inline void nop_flush_icache_all(void) { } +static inline void nop_flush_kern_cache_all(void) { } +static inline void nop_flush_kern_cache_louis(void) { } +static inline void nop_flush_user_cache_all(void) { } +static inline void nop_flush_user_cache_range(unsigned long a, unsigned long b, unsigned int c) { } -extern inline void nop_coherent_kern_range(unsigned long a, unsigned long b) { } -extern inline int nop_coherent_user_range(unsigned long a, +static inline void nop_coherent_kern_range(unsigned long a, unsigned long b) { } +static inline int nop_coherent_user_range(unsigned long a, unsigned long b) { return 0; } -extern inline void nop_flush_kern_dcache_area(void *a, size_t s) { } +static inline void nop_flush_kern_dcache_area(void *a, size_t s) { } -extern inline void nop_dma_flush_range(const void *a, const void *b) { } +static inline void nop_dma_flush_range(const void *a, const void *b) { } -extern inline void nop_dma_map_area(const void *s, size_t l, int f) { } -extern inline void nop_dma_unmap_area(const void *s, size_t l, int f) { } +static inline void nop_dma_map_area(const void *s, size_t l, int f) { } +static inline void nop_dma_unmap_area(const void *s, size_t l, int f) { } #endif #ifndef MULTI_CACHE