Commit f24f21c4 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'topic/objtool' into next 

Merge the powerpc objtool support, which we were keeping in a topic
branch in case of any merge conflicts.
parents 64fdcbcc a39818a3

Makefile

+3 −1
Original line number Diff line number Diff line
@@ -933,8 +933,10 @@ ifdef CONFIG_FTRACE_MCOUNT_USE_CC 
  endif

endif

ifdef CONFIG_FTRACE_MCOUNT_USE_OBJTOOL

  ifdef CONFIG_HAVE_OBJTOOL_NOP_MCOUNT

    CC_FLAGS_USING	+= -DCC_USING_NOP_MCOUNT

  endif

endif

ifdef CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT

  ifdef CONFIG_HAVE_C_RECORDMCOUNT

    BUILD_C_RECORDMCOUNT := y

arch/powerpc/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -241,6 +241,8 @@ config PPC 
	select HAVE_MOD_ARCH_SPECIFIC

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

	select HAVE_OPTPROBES

	select HAVE_OBJTOOL			if PPC32 || MPROFILE_KERNEL

	select HAVE_OBJTOOL_MCOUNT		if HAVE_OBJTOOL

	select HAVE_PERF_EVENTS

	select HAVE_PERF_EVENTS_NMI		if PPC64

	select HAVE_PERF_REGS

arch/powerpc/include/asm/asm.h

0 → 100644
+7 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_POWERPC_ASM_H

#define _ASM_POWERPC_ASM_H



#define _ASM_PTR	" .long "



#endif /* _ASM_POWERPC_ASM_H */

arch/powerpc/include/asm/bug.h

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ 
	__label__ __label_warn_on;				\

								\

	WARN_ENTRY("twi 31, 0, 0", BUGFLAG_WARNING | (flags), __label_warn_on); \

	unreachable();						\

	barrier_before_unreachable();				\

	__builtin_unreachable();				\

								\

__label_warn_on:						\

	break;							\

arch/powerpc/include/asm/linkage.h

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


#include <asm/types.h>



#define __ALIGN		.align 2

#define __ALIGN_STR	".align 2"



#ifdef CONFIG_PPC64_ELF_ABI_V1

#define cond_syscall(x) \

	asm ("\t.weak " #x "\n\t.set " #x ", sys_ni_syscall\n"		\