From patchwork Sat Mar 15 05:40:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 26318 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 BF0AB202DD for ; Sat, 15 Mar 2014 05:43:31 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id j17sf13403114oag.2 for ; Fri, 14 Mar 2014 22:43:31 -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: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=oFeriXKx3KVzwY/Pw0vr5y8hz9VLNlLTWFgJHridBkY=; b=nF9i5wS7MmzaARgJz8SfV8fZKYk2oeaLM06n9MUlK0mSJY52wUgU69491b2/Jm01BC 60XZXf1lmNeA9YxEq5PfS3li9LGWZq7Ea+2c0Es9KbQkcotmET+nbcCBIZCtOoL0k0LT Ja1N3+fNjA1CtMYStG55Ezrc5nHt5Ko3z/jDKf27dFpd9zEJ9daj25x1UQqPbZZW8cui 4W83buczT0t2Os/1vUN5BkaXFUPAA4uHnnXR3U4hTD1O7MNtZ8Udr1vZSTCLybHPe7Gx 5yLODwqTFJwxiHEebkC01b12OLppsBMSEMX1AmVv1M47lZiWgtZ9rQ/iUsZxfeVAG3px HhaA== X-Gm-Message-State: ALoCoQlL+hFz8F0M8MksywerDVYHhg5kxXbY5buChxggONWOuzNPth8JTy1/SKmQNmeSS5dOgEks X-Received: by 10.182.98.230 with SMTP id el6mr4841624obb.10.1394862211368; Fri, 14 Mar 2014 22:43:31 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.23.111 with SMTP id 102ls995230qgo.44.gmail; Fri, 14 Mar 2014 22:43:31 -0700 (PDT) X-Received: by 10.221.29.196 with SMTP id rz4mr9783546vcb.8.1394862211277; Fri, 14 Mar 2014 22:43:31 -0700 (PDT) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id h13si2916543vct.143.2014.03.14.22.43.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Mar 2014 22:43:31 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.179 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.179; Received: by mail-ve0-f179.google.com with SMTP id db12so3727298veb.10 for ; Fri, 14 Mar 2014 22:43:31 -0700 (PDT) X-Received: by 10.52.164.39 with SMTP id yn7mr578118vdb.25.1394862211200; Fri, 14 Mar 2014 22:43:31 -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 i9csp72940vck; Fri, 14 Mar 2014 22:43:30 -0700 (PDT) X-Received: by 10.68.194.65 with SMTP id hu1mr986629pbc.158.1394862209682; Fri, 14 Mar 2014 22:43:29 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tm9si5267409pab.428.2014.03.14.22.42.59; Fri, 14 Mar 2014 22:42:59 -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 S1755667AbaCOFlc (ORCPT + 26 others); Sat, 15 Mar 2014 01:41:32 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:63563 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754810AbaCOFl2 (ORCPT ); Sat, 15 Mar 2014 01:41:28 -0400 Received: by mail-pd0-f178.google.com with SMTP id x10so3396816pdj.37 for ; Fri, 14 Mar 2014 22:41:27 -0700 (PDT) X-Received: by 10.68.143.100 with SMTP id sd4mr13510879pbb.0.1394862087280; Fri, 14 Mar 2014 22:41:27 -0700 (PDT) Received: from localhost.localdomain (pdddd29.tkyoac00.ap.so-net.ne.jp. [218.221.221.41]) by mx.google.com with ESMTPSA id iq10sm22299003pbc.14.2014.03.14.22.41.23 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Mar 2014 22:41:26 -0700 (PDT) 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 v7 1/7] arm64: add __ASSEMBLY__ in asm/insn.h Date: Sat, 15 Mar 2014 14:40:42 +0900 Message-Id: <1394862048-28758-2-git-send-email-takahiro.akashi@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1394862048-28758-1-git-send-email-takahiro.akashi@linaro.org> References: <1394705630-12384-1-git-send-email-takahiro.akashi@linaro.org> <1394862048-28758-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.179 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__. Acked-by: Will Deacon 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 */