From patchwork Fri Feb 28 05:18:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 25510 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f71.google.com (mail-pb0-f71.google.com [209.85.160.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D24792055D for ; Fri, 28 Feb 2014 05:20:42 +0000 (UTC) Received: by mail-pb0-f71.google.com with SMTP id up15sf545060pbc.2 for ; Thu, 27 Feb 2014 21:20:42 -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:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=X6P1C/nT8vqBz0SmyqlHSG5HOMQhk9CjLuxx5q2Mn6A=; b=KW7Nj231cdHPDUqHjK9OhUuw5+RnDMo3N6ZrfLshpgVEq9FyY5rWiSDPLDsHWH3WO7 Jdjx/v3SuOKXc2ArrK8E1WN/go2r2qmB4jDCue/Rj1dycvvtBF9ZGdogyb+UcEW6TnF3 9JL1U8CPVEWMRRhiisQXNNnXeMY6/FmxT2F7g46/Wa2VH7ytp+eW7DucQhCNdCuZQuIt 5RDpIemvGd/iLC8PW1FZkMlOS9Lk41bf1OLvan/zz8Jq3qM6xyffx2y1ktBuEek8W7Od ZSuFKKAPQf/To+kutAJPu+cPIzRuHMvS6HsOccC0f4xqRw4Ba3LsFPsPD/fFkiDyagyk qIzQ== X-Gm-Message-State: ALoCoQm1b7mW+bEKZyeJIaw7tE9p540tJgYrdTAoxnBRJd4U9fAGmEZu3hrmaufJ972LdB930kKh X-Received: by 10.66.221.137 with SMTP id qe9mr414793pac.4.1393564841948; Thu, 27 Feb 2014 21:20:41 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.41.230 with SMTP id z93ls978623qgz.93.gmail; Thu, 27 Feb 2014 21:20:41 -0800 (PST) X-Received: by 10.58.18.231 with SMTP id z7mr835625ved.40.1393564841807; Thu, 27 Feb 2014 21:20:41 -0800 (PST) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id x3si1229088vcn.9.2014.02.27.21.20.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Feb 2014 21:20:41 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id jw12so245843veb.4 for ; Thu, 27 Feb 2014 21:20:41 -0800 (PST) X-Received: by 10.52.89.230 with SMTP id br6mr12086547vdb.20.1393564841596; Thu, 27 Feb 2014 21:20:41 -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.130.193 with SMTP id u1csp28955vcs; Thu, 27 Feb 2014 21:20:41 -0800 (PST) X-Received: by 10.68.240.36 with SMTP id vx4mr1227708pbc.140.1393564840647; Thu, 27 Feb 2014 21:20:40 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ic5si597704pbb.318.2014.02.27.21.20.39; Thu, 27 Feb 2014 21:20:40 -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 S1751228AbaB1FUb (ORCPT + 26 others); Fri, 28 Feb 2014 00:20:31 -0500 Received: from mail-pa0-f50.google.com ([209.85.220.50]:47603 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750835AbaB1FUX (ORCPT ); Fri, 28 Feb 2014 00:20:23 -0500 Received: by mail-pa0-f50.google.com with SMTP id kq14so271639pab.23 for ; Thu, 27 Feb 2014 21:20:23 -0800 (PST) X-Received: by 10.68.237.228 with SMTP id vf4mr1109632pbc.131.1393564822970; Thu, 27 Feb 2014 21:20:22 -0800 (PST) Received: from localhost.localdomain (KD182249084248.au-net.ne.jp. [182.249.84.248]) by mx.google.com with ESMTPSA id vn10sm1790978pbc.21.2014.02.27.21.20.16 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Feb 2014 21:20:22 -0800 (PST) From: AKASHI Takahiro To: rostedt@goodmis.org, fweisbec@gmail.com, mingo@redhat.com, catalin.marinas@arm.com, will.deacon@arm.com, tim.bird@sonymobile.com Cc: gkulkarni@caviumnetworks.com, dsaxena@linaro.org, arndb@arndb.de, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v5 7/7] arm64: add __ASSEMBLY__ in asm/insn.h Date: Fri, 28 Feb 2014 14:18:44 +0900 Message-Id: <1393564724-3966-8-git-send-email-takahiro.akashi@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1393564724-3966-1-git-send-email-takahiro.akashi@linaro.org> References: <1393320196-2942-1-git-send-email-takahiro.akashi@linaro.org> <1393564724-3966-1-git-send-email-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: takahiro.akashi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.173 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 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: , Since insn.h is indirectly included in asm/entry-ftrace.S, we need to exclude some declarations by __ASSEMBLY__. Signed-off-by: AKASHI Takahiro --- arch/arm64/include/asm/insn.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/include/asm/insn.h b/arch/arm64/include/asm/insn.h index c44ad39..dc1f73b 100644 --- a/arch/arm64/include/asm/insn.h +++ b/arch/arm64/include/asm/insn.h @@ -21,6 +21,7 @@ /* A64 instructions are always 32 bits. */ #define AARCH64_INSN_SIZE 4 +#ifndef __ASSEMBLY__ /* * ARM Architecture Reference Manual for ARMv8 Profile-A, Issue A.a * Section C3.1 "A64 instruction index by encoding": @@ -104,5 +105,6 @@ bool aarch64_insn_hotpatch_safe(u32 old_insn, u32 new_insn); int aarch64_insn_patch_text_nosync(void *addr, u32 insn); int aarch64_insn_patch_text_sync(void *addrs[], u32 insns[], int cnt); int aarch64_insn_patch_text(void *addrs[], u32 insns[], int cnt); +#endif /* __ASSEMBLY__ */ #endif /* __ASM_INSN_H */