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: 4092361 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E70749F39D for ; Wed, 30 Apr 2014 09:58:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 248A620211 for ; Wed, 30 Apr 2014 09:58:19 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 56D72200E7 for ; Wed, 30 Apr 2014 09:58:18 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WfRFN-0005bK-DU; Wed, 30 Apr 2014 09:56:13 +0000 Received: from mail-ie0-f170.google.com ([209.85.223.170]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WfRFK-0005Mt-J5 for linux-arm-kernel@lists.infradead.org; Wed, 30 Apr 2014 09:56:11 +0000 Received: by mail-ie0-f170.google.com with SMTP id rd18so1642290iec.29 for ; Wed, 30 Apr 2014 02:55:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fb3JhRsPSjHbgCO5hfbfVshuWObjjjMlJONyZMAmqUQ=; b=hjUY0qHJwiCh8iG91AoI8A9EAa6jiXiuW3n33MMNCaVXkZ7XLkFzOwNaxjAvSAtRJC 4uAfamewUB0GqpQbXIM280Xd1KILtSfRUTXSClRK0wuRJWEOmBR3Je0tgFMR8YmR4E8x Mi3A9hmlHSYB6kfNpSNgcvpjGaUUaNR077QBGX8whmZqLfRoldlUuCXzGK2KBfpg35lg He/QqIZKlyL/L32R9Ec970wePmyqegIo4Oo6ffI/dsOkpI3I30/PQIYX0YIiqOeQsNhS 43GJSIFB9nQvXrqvwxwbAOniYMY5BuBSipZNq15BQVCdewcneOiJOp88Ichws51I2Kav eyHQ== X-Gm-Message-State: ALoCoQkzwIv5lFujsmHzsrDZOq5pTESpf8BoBaNJsyT4oBKX5ZknL7wEhcGhWyIlwlphaTEokaV6 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140430_025610_686529_1D4974E7 X-CRM114-Status: UNSURE ( 9.35 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: linaro-kernel@lists.linaro.org, arndb@arndb.de, linux-kernel@vger.kernel.org, AKASHI Takahiro , dsaxena@linaro.org, gkulkarni@caviumnetworks.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 */