Commit c29214bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-6.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:

 - Drop orphaned VAS MAINTAINERS entry

 - Fix build errors with clang and KCSAN

 - Avoid build errors seen with LD_DEAD_CODE_DATA_ELIMINATION together
   with recordmcount

Thanks to Nathan Chancellor.

* tag 'powerpc-6.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc: Avoid dead code/data elimination when using recordmcount
  powerpc/vmlinux.lds: Add .text.asan/tsan sections
  powerpc: Drop orphaned VAS MAINTAINERS entry
parents d172859e f8b2336f

MAINTAINERS

+0 −7
Original line number Diff line number Diff line
@@ -9790,13 +9790,6 @@ L: netdev@vger.kernel.org 
S:	Supported

F:	drivers/net/ethernet/ibm/ibmvnic.*









IBM Power Virtual Accelerator Switchboard









L:	linuxppc-dev@lists.ozlabs.org









S:	Supported









F:	arch/powerpc/include/asm/vas.h









F:	arch/powerpc/platforms/powernv/copy-paste.h









F:	arch/powerpc/platforms/powernv/vas*

















IBM Power Virtual Ethernet Device Driver









M:	Nick Child <nnac123@linux.ibm.com>









L:	netdev@vger.kernel.org
































arch/powerpc/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -236,7 +236,7 @@ config PPC







	select HAVE_KPROBES









	select HAVE_KPROBES_ON_FTRACE









	select HAVE_KRETPROBES









	select HAVE_LD_DEAD_CODE_DATA_ELIMINATION









	select HAVE_LD_DEAD_CODE_DATA_ELIMINATION if HAVE_OBJTOOL_MCOUNT









	select HAVE_LIVEPATCH			if HAVE_DYNAMIC_FTRACE_WITH_REGS









	select HAVE_MOD_ARCH_SPECIFIC









	select HAVE_NMI				if PERF_EVENTS || (PPC64 && PPC_BOOK3S)
































arch/powerpc/kernel/vmlinux.lds.S



+1
−0






























Original line number
Diff line number
Diff line







@@ -124,6 +124,7 @@ SECTIONS







		 * included with the main text sections, so put it by itself.









		 */









		*(.sfpr);









		*(.text.asan.* .text.tsan.*)









		MEM_KEEP(init.text)









		MEM_KEEP(exit.text)









	} :text