Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp1200460pxy;
        Thu, 6 May 2021 02:46:46 -0700 (PDT)
X-Google-Smtp-Source: ABdhPJwTZ7v9ElA4kYmWRC4+3BOktJtvhJ/Cs0C//hSX62xHO09TrAnUutmvDZhKdUOYnc0KDkvU
X-Received: by 2002:aa7:d382:: with SMTP id x2mr4000542edq.60.1620294406009;
        Thu, 06 May 2021 02:46:46 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1620294406; cv=none;
        d=google.com; s=arc-20160816;
        b=OrzQ1T/srwu62gCKFlGw1JKD45UXJeOWhblqfGyapM5DvIq3Cpsh/QxatRjsq5ET93
         aRbWBIR3o9pyt4IPxZPjjhT6KjlKvh62l0V3lEWoW4nejqPlubARhbwSTocWxLeU+G6x
         tqJqeBH+9O/29LL0Vjn6VN2XfLVsQrn6IUPlWHnSDa4r5g7d9N7C4QbLbE6+A3iU32iS
         HcR8wIiQQ7GUgT6HBaBfW90Z3u4FFwOYi5FPP67ifzQaoBtqYwOeUwbJhQGyhk/j4NLg
         HwXqFlR/KQhKWGkztqQp3rAWvWUGhSHzda82f2B+O7zoykSa5PPczOiphi/uyKaiEiA2
         98fA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:content-transfer-encoding:mime-version
         :message-id:date:subject:cc:to:from;
        bh=8c4BtOYlyJwDZiPvSfM09D15Hy10U9v+4pa50sy6zHs=;
        b=bWvbJVjKmbhNIF15Wpz6EetB2LuIzvhxCCTSklzPuw+dagdWRJs+4nwtmS4ypINb94
         QAZ5VpDz3s+DKNQpvJ/Ol0L3KZcyVi1tB0lc6TqDDwUoN1lvq2+Tffo6WvYpa5ZZx5CQ
         DBxLeQ/O4NKng/zAZkCiQAkAj4LKCNhptbsK1y46yWoxHbYKqYRlqAFvc2RntrxLWa/y
         4s+IUgm5iGyK+CnZx39x3YktTcRTJ9INzzwM0uSCE9EMMKPd0yvF7zVhi5en8fQnXeth
         kjrZkjYP8SphSNkVZ/41mMSolC190JIXgYh4cgXkh2TLs9AXrgaBEMPk7WPvsTX1R0w+
         XloA==
ARC-Authentication-Results: i=1; mx.google.com;
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vivo.com
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18])
        by mx.google.com with ESMTP id p13si1819430edy.225.2021.05.06.02.46.21;
        Thu, 06 May 2021 02:46:45 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Authentication-Results: mx.google.com;
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vivo.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S234114AbhEFJoz (ORCPT <rfc822;li.zhiang.cn@gmail.com>
        + 99 others); Thu, 6 May 2021 05:44:55 -0400
Received: from mail-m176216.qiye.163.com ([59.111.176.216]:62016 "EHLO
        mail-m176216.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S231837AbhEFJoz (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 6 May 2021 05:44:55 -0400
Received: from wanjb-virtual-machine.localdomain (unknown [36.152.145.182])
        by mail-m176216.qiye.163.com (Hmail) with ESMTPA id 748B3C201AA;
        Thu,  6 May 2021 17:43:55 +0800 (CST)
From:   Wan Jiabing <wanjiabing@vivo.com>
To:     Arnaldo Carvalho de Melo <acme@redhat.com>,
        Borislav Petkov <bp@suse.de>,
        Michael Ellerman <mpe@ellerman.id.au>,
        Wan Jiabing <wanjiabing@vivo.com>,
        Tony Luck <tony.luck@intel.com>,
        Dan Williams <dan.j.williams@intel.com>,
        linux-kernel@vger.kernel.org
Cc:     kael_w@yeah.net
Subject: [PATCH] tools/x86: update include of alternative
Date:   Thu,  6 May 2021 17:43:28 +0800
Message-Id: <20210506094335.18281-1-wanjiabing@vivo.com>
X-Mailer: git-send-email 2.25.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZS1VLWVdZKFlBSE83V1ktWUFJV1kPCR
        oVCBIfWUFZGktJSVZDHx1LT0MfTxkdS0hVEwETFhoSFyQUDg9ZV1kWGg8SFR0UWUFZT0tIVUpKS0
        hOSFVLWQY+
X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6Nj46OBw6MD8IT0JPUSwTPkgy
        IhwaChBVSlVKTUlLSUJPSUhNSk9PVTMWGhIXVQwaFRESGhkSFRw7DRINFFUYFBZFWVdZEgtZQVlI
        TVVKTklVSk9OVUpDSVlXWQgBWUFJSUpMNwY+
X-HM-Tid: 0a79410ff606d976kuws748b3c201aa
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

In commit 5e21a3ecad15 ("x86/alternative: Merge include files"),
arch/x86/include/asm/alternative-asm.h was replaced by
arch/x86/include/asm/alternative.h. Fix them in tools directory.

Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
---
 tools/arch/x86/lib/memcpy_64.S | 2 +-
 tools/arch/x86/lib/memset_64.S | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/arch/x86/lib/memcpy_64.S b/tools/arch/x86/lib/memcpy_64.S
index 1e299ac73c86..1cc9da6e29c7 100644
--- a/tools/arch/x86/lib/memcpy_64.S
+++ b/tools/arch/x86/lib/memcpy_64.S
@@ -4,7 +4,7 @@
 #include <linux/linkage.h>
 #include <asm/errno.h>
 #include <asm/cpufeatures.h>
-#include <asm/alternative-asm.h>
+#include <asm/alternative.h>
 #include <asm/export.h>
 
 .pushsection .noinstr.text, "ax"
diff --git a/tools/arch/x86/lib/memset_64.S b/tools/arch/x86/lib/memset_64.S
index 0bfd26e4ca9e..9827ae267f96 100644
--- a/tools/arch/x86/lib/memset_64.S
+++ b/tools/arch/x86/lib/memset_64.S
@@ -3,7 +3,7 @@
 
 #include <linux/linkage.h>
 #include <asm/cpufeatures.h>
-#include <asm/alternative-asm.h>
+#include <asm/alternative.h>
 #include <asm/export.h>
 
 /*
-- 
2.25.1