From patchwork Sun Sep 9 15:47:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Ojeda X-Patchwork-Id: 10593371 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 65E1A109C for ; Sun, 9 Sep 2018 15:48:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EE8F292D3 for ; Sun, 9 Sep 2018 15:48:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E383292D7; Sun, 9 Sep 2018 15:48:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.1 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,FSL_HELO_FAKE,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 753FF292D3 for ; Sun, 9 Sep 2018 15:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:To:From :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=tejGvC+Cj64vPIxePprhEQzKQtZnTqw+tRcPXjmH9V0=; b=lX44BTihvrSGLn 62VItznwyYIXjJmjvvbbUV7F3850agKzxxEHsmRZhU6IRAsuU29QFL/z6TfXRlDnejzce/RbfFW+8 Dz8G+cCpeKCMc4Om7LPWeNxXlQIaDngEIpnmzRow6l0m4PMdYj0CEmi9WuZf3CRfrP2kZ4UhAaT51 ynkroCErUBVfx4CkeaP3o1boj+XbeNAmSx4iBklmPC71Pjywejs1oA0G/EYYDo1aeUJzdQios+lsO qKtQ17gm/D+YZuW3Bj6uKA8wvqaQG5DWSwhbrRRXWcWOSNDqU0TOYF01UXvZ4FTMX38K/GH5NH/Pa 8U4BK6kRYhEqfQ19ZWxg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fz1wK-0003xz-3N; Sun, 09 Sep 2018 15:47:56 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fz1wG-0003xc-LV for linux-arm-kernel@lists.infradead.org; Sun, 09 Sep 2018 15:47:54 +0000 Received: by mail-wr1-x441.google.com with SMTP id v90-v6so19397450wrc.0 for ; Sun, 09 Sep 2018 08:47:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=AeMTx8qk3FDW9w7DTC4mll/cK3b+woQ7VNKwZGErtIQ=; b=ozgKaxvdOaMLMb9iu0KILKaQE8oQXOUlFHCkRu4nxy2AQIh+ivZoiIcETbWipaWdSI XkA03z3XMOjNBtt3kJ+GUpDQpflAlBGrRq6/fZgUuvB0xg1mhmQxXfW4Jpi0CJ1OCskw 4xl1YlGRwSEfroZHZly0Vab5TgXGntNk/vwRt9RPN73xAm9P8IBRXrYWg4H1XhZL9ZC/ 8ZTfm0sM06nFv+c/OXn4Hr5EHSIjSAWYTT1vlfCBcQX1abJ5aaxCDjLd+dOSrce9Qf+y UTjCOoYhh1iueqbeDlnuaZmZjRvJdW5jmT6OvOIQ8DA8qHGsciVAzrKR5wvOSYgtdwVp Bqlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=AeMTx8qk3FDW9w7DTC4mll/cK3b+woQ7VNKwZGErtIQ=; b=R+e0emZKuJjVp22pBANUQtrsMh/6EnwxRSb+UmaRUtAUwJbMM0TltJGWr9Dfa1mQNU HdAAeSGq/funcdDGAIENpuJR7uLRVdVIq2FW17XGjEpEd3ojbYfKW9WG4AgUx+5KyRhe LXP9s7yEV5VNPqhV+pJh023NMvR6CbzLiuEJOHyuvMehi0egT0UNJopfi9CitMkFZTLh 4xg2C9kWz1iVZ8x3n9f9N9gUZ+q7yYQx6HeX2Z6qFfFMclG2OBWquDZPPWDfDwpbo4wW VRZFeen/83Piq0DrOQOCL3r6gyCVZzD5wG25eOAfs4M6R53Dreq8O8ykuDuu0gHHI4qj A5gw== X-Gm-Message-State: APzg51CO8quQ9gLfIuzo0TtSQW9FJzKzD8Pu5ORf/zGLYaJrSyY6evfg ehBSMyaedc/Pefm48V9yY+If3zFdyLk= X-Google-Smtp-Source: ANB0VdZCYnJXmwkQCis27/OjiY0+r2Q0Ct98BNx8eazji2EuCOFe7h+YYG+W0BBd2fzG+ZFB15rjig== X-Received: by 2002:a5d:488c:: with SMTP id g12-v6mr12458811wrq.0.1536508059789; Sun, 09 Sep 2018 08:47:39 -0700 (PDT) Received: from gmail.com (62.83.35.8.dyn.user.ono.com. [62.83.35.8]) by smtp.gmail.com with ESMTPSA id u4-v6sm8961460wro.47.2018.09.09.08.47.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 Sep 2018 08:47:38 -0700 (PDT) Date: Sun, 9 Sep 2018 17:47:31 +0200 From: Miguel Ojeda To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] arch/arm64/include/asm/jump_label.h: use asm_volatile_goto Message-ID: <20180909154731.GA20381@gmail.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: elm/2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180909_084752_701560_47EF622C X-CRM114-Status: GOOD ( 12.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Catalin Marinas , Nick Desaulniers , linux-kernel@vger.kernel.org, Will Deacon Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP All other uses of "asm goto" go through asm_volatile_goto (including the arm version of the same file). For consistency, use it here as well. Cc: Nick Desaulniers Cc: Catalin Marinas Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Miguel Ojeda Reviewed-by: Nick Desaulniers --- arch/arm64/include/asm/jump_label.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/jump_label.h b/arch/arm64/include/asm/jump_label.h index 1b5e0e843c3a..7e2b3e360086 100644 --- a/arch/arm64/include/asm/jump_label.h +++ b/arch/arm64/include/asm/jump_label.h @@ -28,7 +28,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool branch) { - asm goto("1: nop\n\t" + asm_volatile_goto("1: nop\n\t" ".pushsection __jump_table, \"aw\"\n\t" ".align 3\n\t" ".quad 1b, %l[l_yes], %c0\n\t" @@ -42,7 +42,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch) { - asm goto("1: b %l[l_yes]\n\t" + asm_volatile_goto("1: b %l[l_yes]\n\t" ".pushsection __jump_table, \"aw\"\n\t" ".align 3\n\t" ".quad 1b, %l[l_yes], %c0\n\t"