Skip to content

Commit c29214b

Browse files
committed
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
2 parents d172859 + f8b2336 commit c29214b

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

MAINTAINERS

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9790,13 +9790,6 @@ L: [email protected]
97909790
S: Supported
97919791
F: drivers/net/ethernet/ibm/ibmvnic.*
97929792

9793-
IBM Power Virtual Accelerator Switchboard
9794-
9795-
S: Supported
9796-
F: arch/powerpc/include/asm/vas.h
9797-
F: arch/powerpc/platforms/powernv/copy-paste.h
9798-
F: arch/powerpc/platforms/powernv/vas*
9799-
98009793
IBM Power Virtual Ethernet Device Driver
98019794
M: Nick Child <[email protected]>
98029795

arch/powerpc/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ config PPC
236236
select HAVE_KPROBES
237237
select HAVE_KPROBES_ON_FTRACE
238238
select HAVE_KRETPROBES
239-
select HAVE_LD_DEAD_CODE_DATA_ELIMINATION
239+
select HAVE_LD_DEAD_CODE_DATA_ELIMINATION if HAVE_OBJTOOL_MCOUNT
240240
select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS
241241
select HAVE_MOD_ARCH_SPECIFIC
242242
select HAVE_NMI if PERF_EVENTS || (PPC64 && PPC_BOOK3S)

arch/powerpc/kernel/vmlinux.lds.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ SECTIONS
124124
* included with the main text sections, so put it by itself.
125125
*/
126126
*(.sfpr);
127+
*(.text.asan.* .text.tsan.*)
127128
MEM_KEEP(init.text)
128129
MEM_KEEP(exit.text)
129130
} :text

0 commit comments

Comments
 (0)