git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From fb24e308b6310541e70d11a3f19dc40742974b95 Mon Sep 17 00:00:00 2001
   2 From: Arnaldo Carvalho de Melo <acme@redhat.com>
   3 Date: Sun, 9 May 2021 10:19:37 -0300
   4 Subject: tools arch: Update arch/x86/lib/mem{cpy,set}_64.S copies used in 'perf bench mem memcpy' - again
   5
   6 From: Arnaldo Carvalho de Melo <acme@redhat.com>
   7
   8 commit fb24e308b6310541e70d11a3f19dc40742974b95 upstream.
   9
  10 To bring in the change made in this cset:
  11
  12  5e21a3ecad1500e3 ("x86/alternative: Merge include files")
  13
  14 This just silences these perf tools build warnings, no change in the tools:
  15
  16   Warning: Kernel ABI header at 'tools/arch/x86/lib/memcpy_64.S' differs from latest version at 'arch/x86/lib/memcpy_64.S'
  17   diff -u tools/arch/x86/lib/memcpy_64.S arch/x86/lib/memcpy_64.S
  18   Warning: Kernel ABI header at 'tools/arch/x86/lib/memset_64.S' differs from latest version at 'arch/x86/lib/memset_64.S'
  19   diff -u tools/arch/x86/lib/memset_64.S arch/x86/lib/memset_64.S
  20
  21 Cc: Borislav Petkov <bp@suse.de>
  22 Cc: Juergen Gross <jgross@suse.com>
  23 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  24 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  25 ---
  26  tools/arch/x86/lib/memcpy_64.S                         | 2 +-
  27  tools/arch/x86/lib/memset_64.S                         | 2 +-
  28  tools/include/asm/{alternative-asm.h => alternative.h} | 0
  29  tools/arch/x86/lib/memcpy_64.S      |    2 +-
  30  tools/arch/x86/lib/memset_64.S      |    2 +-
  31  tools/include/asm/alternative-asm.h |   10 ----------
  32  tools/include/asm/alternative.h     |   10 ++++++++++
  33  4 files changed, 12 insertions(+), 12 deletions(-)
  34  rename tools/include/asm/{alternative-asm.h => alternative.h} (100%)
  35
  36 --- a/tools/arch/x86/lib/memcpy_64.S
  37 +++ b/tools/arch/x86/lib/memcpy_64.S
  38 @@ -4,7 +4,7 @@
  39  #include <linux/linkage.h>
  40  #include <asm/errno.h>
  41  #include <asm/cpufeatures.h>
  42 -#include <asm/alternative-asm.h>
  43 +#include <asm/alternative.h>
  44  #include <asm/export.h>
  45
  46  .pushsection .noinstr.text, "ax"
  47 --- a/tools/arch/x86/lib/memset_64.S
  48 +++ b/tools/arch/x86/lib/memset_64.S
  49 @@ -3,7 +3,7 @@
  50
  51  #include <linux/linkage.h>
  52  #include <asm/cpufeatures.h>
  53 -#include <asm/alternative-asm.h>
  54 +#include <asm/alternative.h>
  55  #include <asm/export.h>
  56
  57  /*
  58 --- a/tools/include/asm/alternative-asm.h
  59 +++ /dev/null
  60 @@ -1,10 +0,0 @@
  61 -/* SPDX-License-Identifier: GPL-2.0 */
  62 -#ifndef _TOOLS_ASM_ALTERNATIVE_ASM_H
  63 -#define _TOOLS_ASM_ALTERNATIVE_ASM_H
  64 -
  65 -/* Just disable it so we can build arch/x86/lib/memcpy_64.S for perf bench: */
  66 -
  67 -#define altinstruction_entry #
  68 -#define ALTERNATIVE_2 #
  69 -
  70 -#endif
  71 --- /dev/null
  72 +++ b/tools/include/asm/alternative.h
  73 @@ -0,0 +1,10 @@
  74 +/* SPDX-License-Identifier: GPL-2.0 */
  75 +#ifndef _TOOLS_ASM_ALTERNATIVE_ASM_H
  76 +#define _TOOLS_ASM_ALTERNATIVE_ASM_H
  77 +
  78 +/* Just disable it so we can build arch/x86/lib/memcpy_64.S for perf bench: */
  79 +
  80 +#define altinstruction_entry #
  81 +#define ALTERNATIVE_2 #
  82 +
  83 +#endif