From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Sep 2024 16:11:46 +0000 (-0700)
Subject: Merge tag 's390-6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e08d227840bb9366c6321ae1e480b37ba5eec29b;p=users%2Fhch%2Fblock.git

Merge tag 's390-6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull more s390 updates from Vasily Gorbik:

 - Clean up and improve vdso code: use SYM_* macros for function and
   data annotations, add CFI annotations to fix GDB unwinding, optimize
   the chacha20 implementation

 - Add vfio-ap driver feature advertisement for use by libvirt and
   mdevctl

* tag 's390-6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/vfio-ap: Driver feature advertisement
  s390/vdso: Use one large alternative instead of an alternative branch
  s390/vdso: Use SYM_DATA_START_LOCAL()/SYM_DATA_END() for data objects
  tools: Add additional SYM_*() stubs to linkage.h
  s390/vdso: Use macros for annotation of asm functions
  s390/vdso: Add CFI annotations to __arch_chacha20_blocks_nostack()
  s390/vdso: Fix comment within __arch_chacha20_blocks_nostack()
  s390/vdso: Get rid of permutation constants
---

e08d227840bb9366c6321ae1e480b37ba5eec29b
diff --cc tools/include/linux/linkage.h
index b7183576d8eb,a89620c550ed..7baaa5898ca2
--- a/tools/include/linux/linkage.h
+++ b/tools/include/linux/linkage.h
@@@ -1,10 -1,10 +1,12 @@@
  #ifndef _TOOLS_INCLUDE_LINUX_LINKAGE_H
  #define _TOOLS_INCLUDE_LINUX_LINKAGE_H
  
 +#include <linux/export.h>
 +
  #define SYM_FUNC_START(x) .globl x; x:
- 
  #define SYM_FUNC_END(x)
+ #define SYM_DATA_START(x) .globl x; x:
+ #define SYM_DATA_START_LOCAL(x) x:
+ #define SYM_DATA_END(x)
  
  #endif /* _TOOLS_INCLUDE_LINUX_LINKAGE_H */