* [PATCH] tools/x86: update include of alternative
@ 2021-05-06 9:43 Wan Jiabing
2021-05-12 13:46 ` Borislav Petkov
0 siblings, 1 reply; 2+ messages in thread
From: Wan Jiabing @ 2021-05-06 9:43 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo, Borislav Petkov, Michael Ellerman,
Wan Jiabing, Tony Luck, Dan Williams, linux-kernel
Cc: kael_w
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] tools/x86: update include of alternative
2021-05-06 9:43 [PATCH] tools/x86: update include of alternative Wan Jiabing
@ 2021-05-12 13:46 ` Borislav Petkov
0 siblings, 0 replies; 2+ messages in thread
From: Borislav Petkov @ 2021-05-12 13:46 UTC (permalink / raw)
To: Wan Jiabing
Cc: Arnaldo Carvalho de Melo, Michael Ellerman, Tony Luck,
Dan Williams, linux-kernel, kael_w
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-12 13:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-06 9:43 [PATCH] tools/x86: update include of alternative Wan Jiabing
2021-05-12 13:46 ` Borislav Petkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).