Merge tag 'powerpc-7.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc updates from Madhavan Srinivasan:

 - powerpc/numa: Support coregroup on PowerNV

 - powerpc/irq: Move __softirq_pending out of irq_stat

 - powerpc/512x: Remove pdm360ng platform setup in favor of mpc512x_generic

 - powerpc/ps3: Simplify control flow in ps3_{virq,irq_plug}_setup()

 - KVM: PPC: Book3S HV: Add preempt_disable() around virtual-mode HPTE bit-lock users

 - powerpc/syscall: Avoid atomic test_and_clear_thread_flag on fast path

 - pseries/plpks cleanup and fixes

 - Misc fixes and cleanup

Thanks to Abhishek Dubey, Amit Machhiwal, Anushree Mathur, Bui Nguyen
Nhu Quynh, Christophe Leroy (CS GROUP), Dmitry Torokhov, Gaurav Batra,
Gautam Menghani, Geert Uytterhoeven, Greg Joyce, Hari Bathini, Harsh
Prateek Bora, Karl Mehltretter, Link Mauve, Michal Suchánek, Mukesh
Kumar Chaurasiya (IBM), Nayna Jain, Ritesh Harjani (IBM), R Nageswara
Sastry, Saket Kumar Bhaskar, Samir Mulani, Shivang Upadhyay, Shrikanth
Hegde, Sourabh Jain, Srikar Dronamraju, Srish Srinivasan, Thorsten Blum,
Vaibhav Jain (IBM), Venkat Rao Bagalkote, and Yeswanth Krishna Tellakula

* tag 'powerpc-7.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (44 commits)
  powerpc/numa: Support coregroup on PowerNV
  powerpc/numa: Allow cpu_to_coregroup_id without PPC_SPLPAR
  powerpc/numa: Simplify find_primary_domain_index
  powerpc/fadump: collect dump when CPU_STATE_DATA is less than reserved
  powerpc/syscall: Avoid atomic test_and_clear_thread_flag on fast path
  powerpc/kasan: fix r2 corruption in mem*() on GENERIC_ENTRY with old compilers
  powerpc: fix NMI exit ordering: restore soft masks after irqentry_nmi_exit()
  powerpc/pseries/iommu: Add TCEs for 16GB pages when RAM is pre-mapped
  KVM: PPC: Book3S HV: Free the queue pages in error path
  KVM: PPC: Book3S HV: Add missing mappings for tracing exits
  powerpc/interrupt: Use early_radix_enabled() in NMI real-mode guard
  KVM: PPC: Fix get_d_signext() 12-bit displacement for paired-single D-form
  KVM: PPC: Book3S HV: Add preempt_disable() around virtual-mode HPTE bit-lock users
  KVM: PPC: Book3S HV: Add SRCU protection for virtual-mode HPT hcalls
  pseries/plpks: update PKS documentation and MAINTAINERS entry
  pseries/plpks: rename the default wrapping key macro
  pseries/plpks: make narrowing conversions explicit
  pseries/plpks: hide wrapping_features when unsupported
  pseries/plpks: fix self-reference in plpks_var initializer
  pseries/plpks: clear SED key data after use
  ...

1 files changed, 1 insertions, 20 deletions

diff --git a/arch/powerpc/include/asm/string.h b/arch/powerpc/include/asm/string.h
index 1981bd4036b5..161b949683b3 100644
--- a/arch/powerpc/include/asm/string.h
+++ b/arch/powerpc/include/asm/string.h
@@ -29,29 +29,10 @@ extern void * memchr(const void *,int,__kernel_size_t);
 void memcpy_flushcache(void *dest, const void *src, size_t size);
 
 #ifdef CONFIG_KASAN
-/* __mem variants are used by KASAN to implement instrumented meminstrinsics. */
-#ifdef CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX
+/* Used by mm/kasan as raw backends to bypass KASAN checking. */
 #define __memset memset
 #define __memcpy memcpy
 #define __memmove memmove
-#else /* CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX */
-void *__memset(void *s, int c, __kernel_size_t count);
-void *__memcpy(void *to, const void *from, __kernel_size_t n);
-void *__memmove(void *to, const void *from, __kernel_size_t n);
-#ifndef __SANITIZE_ADDRESS__
-/*
- * For files that are not instrumented (e.g. mm/slub.c) we
- * should use not instrumented version of mem* functions.
- */
-#define memcpy(dst, src, len) __memcpy(dst, src, len)
-#define memmove(dst, src, len) __memmove(dst, src, len)
-#define memset(s, c, n) __memset(s, c, n)
-
-#ifndef __NO_FORTIFY
-#define __NO_FORTIFY /* FORTIFY_SOURCE uses __builtin_memcpy, etc. */
-#endif
-#endif /* !__SANITIZE_ADDRESS__ */
-#endif /* CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX */
 #endif /* CONFIG_KASAN */
 
 #ifdef CONFIG_PPC64