From patchwork Wed Apr 30 09:54:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 29395 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 95F6E203F3 for ; Wed, 30 Apr 2014 09:56:03 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id l6sf4781154qcy.3 for ; Wed, 30 Apr 2014 02:56:03 -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=woVDh16/soj9niqCX6AkWL1ZRA6/7Gd9R5CiZ9Qhah0=; b=iJHNsTgFE/ifCLROKGOoqZv891Ur33I5reFqOiQeNOKq0Xiv3DuBe5+GyUmOmE/f4F E0V7HU7MUXZQUpbTGSait0hGPTtQ3P14+l3PklrT0AFwyyMq4/mPXmkDaLH5pO3lipdT FuTqR/mO42TlmlxVRVYIKpTbUFIqXpZOrgZeB1k6H6RfN9+2B9T2v+fAwv62vdO3vd55 Sm+cEQhwc/91WyYHNXy9/lEdPaovL+kBmfHCGn6Gas4n461hoKEa5rGS1gI62lrY9Ghj Dh7A8pDwYix2lHs9w36yNDG9CxrZM39YFAou5hom0Rx9o90PcYfxm1v2olX/T9+OTzUQ EFrg== X-Gm-Message-State: ALoCoQlrAeDZkHg993K/ZViLMCzb6VYWVysXMxaiIQXAY2QNXr2L7n6D96XahYiqxXEfcHna/AjR X-Received: by 10.58.86.39 with SMTP id m7mr1880305vez.26.1398851763343; Wed, 30 Apr 2014 02:56:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.36.33 with SMTP id o30ls535922qgo.23.gmail; Wed, 30 Apr 2014 02:56:03 -0700 (PDT) X-Received: by 10.52.2.229 with SMTP id 5mr2629728vdx.24.1398851763127; Wed, 30 Apr 2014 02:56:03 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id wd2si5211734veb.5.2014.04.30.02.56.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 30 Apr 2014 02:56:03 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id hq16so1885591vcb.11 for ; Wed, 30 Apr 2014 02:56:03 -0700 (PDT) X-Received: by 10.58.96.36 with SMTP id dp4mr3242205veb.21.1398851763033; Wed, 30 Apr 2014 02:56:03 -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.221.72 with SMTP id ib8csp265318vcb; Wed, 30 Apr 2014 02:56:02 -0700 (PDT) X-Received: by 10.66.191.134 with SMTP id gy6mr6781820pac.27.1398851762104; Wed, 30 Apr 2014 02:56:02 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sr9si16345678pab.448.2014.04.30.02.56.00 for ; Wed, 30 Apr 2014 02:56:00 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758597AbaD3Jzt (ORCPT + 28 others); Wed, 30 Apr 2014 05:55:49 -0400 Received: from mail-ig0-f171.google.com ([209.85.213.171]:63371 "EHLO mail-ig0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757591AbaD3Jzr (ORCPT ); Wed, 30 Apr 2014 05:55:47 -0400 Received: by mail-ig0-f171.google.com with SMTP id c1so1647474igq.4 for ; Wed, 30 Apr 2014 02:55:45 -0700 (PDT) X-Received: by 10.43.155.84 with SMTP id lh20mr662105icc.81.1398851745845; Wed, 30 Apr 2014 02:55:45 -0700 (PDT) Received: from localhost.localdomain (KD182249095136.au-net.ne.jp. [182.249.95.136]) by mx.google.com with ESMTPSA id x7sm1867848igw.1.2014.04.30.02.55.39 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 30 Apr 2014 02:55:44 -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 v8 2/8] arm64: add __ASSEMBLY__ in asm/insn.h Date: Wed, 30 Apr 2014 18:54:30 +0900 Message-Id: <1398851676-16389-3-git-send-email-takahiro.akashi@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1398851676-16389-1-git-send-email-takahiro.akashi@linaro.org> References: <1394862048-28758-1-git-send-email-takahiro.akashi@linaro.org> <1398851676-16389-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: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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 */