linux-kernel - [PATCH] tools/x86: update include of alternative

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Thu,  6 May 2021 17:43:28 +0800
From:   Wan Jiabing <wanjiabing@...o.com>
To:     Arnaldo Carvalho de Melo <acme@...hat.com>,
        Borislav Petkov <bp@...e.de>,
        Michael Ellerman <mpe@...erman.id.au>,
        Wan Jiabing <wanjiabing@...o.com>,
        Tony Luck <tony.luck@...el.com>,
        Dan Williams <dan.j.williams@...el.com>,
        linux-kernel@...r.kernel.org
Cc:     kael_w@...h.net
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 <wanjiabing@...o.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