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 [thread overview]
Message-ID: <20210506094335.18281-1-wanjiabing@vivo.com> (raw)
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
next reply other threads:[~2021-05-06 9:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-06 9:43 Wan Jiabing [this message]
2021-05-12 13:46 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210506094335.18281-1-wanjiabing@vivo.com \
--to=wanjiabing@vivo.com \
--cc=acme@redhat.com \
--cc=bp@suse.de \
--cc=dan.j.williams@intel.com \
--cc=kael_w@yeah.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mpe@ellerman.id.au \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®