From patchwork Tue Feb 25 09:23:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 25259 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6008720558 for ; Tue, 25 Feb 2014 09:25:22 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id v10sf20086353pde.1 for ; Tue, 25 Feb 2014 01:25:21 -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=UDVsKevq7iu21UFzcAcGBjPTkwROCIWV5uk62DF/sLEo/IdApPsJXscr9lU5zEKEb0 dXUMfYhOTu5SSdlpmpQty+hsbKWQ5ij1MfOuEN2ZnaYw+WUUeSp4Hvxm5bCDw98CjYsQ UBRHKBWFpE+7/qfbo8zfzSH0ZtEpewt/CTcRiM0h3JZmiJl955a1q1jS2u5gqdwlbrA5 3UubN9aepR/T2NPHT3eHbTHxU8VLpl3+AGFSNqNlWJVkRNaYotX18lGmUylOWPGnDL4k x4lWFZaEKeren3gh7pvP0PkjUQtq+3DkMDQ+/Nb4SfKnNsbxN++rmGxmRbLsk449wkyV yGJg== X-Gm-Message-State: ALoCoQn0g+KjdHXlhqAhsbLQW47vhytKJeOPbaURz+ri3CwYcQv4uIypv1m2zk5tvOLYr8kiHLY0 X-Received: by 10.66.149.67 with SMTP id ty3mr123700pab.27.1393320321630; Tue, 25 Feb 2014 01:25:21 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.95.134 with SMTP id i6ls2335223qge.2.gmail; Tue, 25 Feb 2014 01:25:21 -0800 (PST) X-Received: by 10.52.164.39 with SMTP id yn7mr89455vdb.25.1393320321444; Tue, 25 Feb 2014 01:25:21 -0800 (PST) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id eb8si6650678vdb.34.2014.02.25.01.25.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Feb 2014 01:25:21 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.171 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.171; Received: by mail-ve0-f171.google.com with SMTP id oz11so118241veb.30 for ; Tue, 25 Feb 2014 01:25:21 -0800 (PST) X-Received: by 10.58.86.230 with SMTP id s6mr207446vez.16.1393320321354; Tue, 25 Feb 2014 01:25:21 -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 u4csp123952vcz; Tue, 25 Feb 2014 01:25:20 -0800 (PST) X-Received: by 10.66.220.198 with SMTP id py6mr481595pac.21.1393320319788; Tue, 25 Feb 2014 01:25:19 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wh4si2990590pbc.87.2014.02.25.01.25.18; Tue, 25 Feb 2014 01:25:18 -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 S1753300AbaBYJY5 (ORCPT + 26 others); Tue, 25 Feb 2014 04:24:57 -0500 Received: from mail-pa0-f43.google.com ([209.85.220.43]:43555 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752754AbaBYJYv (ORCPT ); Tue, 25 Feb 2014 04:24:51 -0500 Received: by mail-pa0-f43.google.com with SMTP id rd3so7847423pab.2 for ; Tue, 25 Feb 2014 01:24:51 -0800 (PST) X-Received: by 10.66.217.169 with SMTP id oz9mr616360pac.20.1393320291263; Tue, 25 Feb 2014 01:24:51 -0800 (PST) Received: from localhost.localdomain (KD182249093189.au-net.ne.jp. [182.249.93.189]) by mx.google.com with ESMTPSA id iq10sm8497678pbc.14.2014.02.25.01.24.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Feb 2014 01:24:50 -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 v4 7/7] arm64: add __ASSEMBLY__ in asm/insn.h Date: Tue, 25 Feb 2014 18:23:16 +0900 Message-Id: <1393320196-2942-8-git-send-email-takahiro.akashi@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1393320196-2942-1-git-send-email-takahiro.akashi@linaro.org> References: <1391768336-5642-1-git-send-email-takahiro.akashi@linaro.org> <1393320196-2942-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.171 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 */