2021-05-06 09:46:46

by Jiabing Wan

Subject: [PATCH] tools/x86: update include of alternative

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 <[email protected]>
---
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

2021-05-12 13:50:52

by Borislav Petkov

Subject: Re: [PATCH] tools/x86: update include of alternative

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 <[email protected]>
> ---
> 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