From: Borislav Petkov <bp@suse.de>
To: Wan Jiabing <wanjiabing@vivo.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Tony Luck <tony.luck@intel.com>,
Dan Williams <dan.j.williams@intel.com>,
linux-kernel@vger.kernel.org, kael_w@yeah.net
Subject: Re: [PATCH] tools/x86: update include of alternative
Date: Wed, 12 May 2021 15:46:39 +0200 [thread overview]
Message-ID: <YJvcPz1IjGpbZ7BX@zn.tnic> (raw)
In-Reply-To: <20210506094335.18281-1-wanjiabing@vivo.com>
On Thu, May 06, 2021 at 05:43:28PM +0800, Wan Jiabing wrote:
> 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>
>
> /*
> --
fb24e308b631 ("tools arch: Update arch/x86/lib/mem{cpy,set}_64.S copies used in 'perf bench mem memcpy'")
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
prev parent reply other threads:[~2021-05-12 13:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-06 9:43 Wan Jiabing
2021-05-12 13:46 ` Borislav Petkov [this message]
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=YJvcPz1IjGpbZ7BX@zn.tnic \
--to=bp@suse.de \
--cc=acme@redhat.com \
--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 \
--cc=wanjiabing@vivo.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®