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

Merge branch 'perf-core-for-linus' of... 

Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (107 commits)
  perf stat: Add more cache-miss percentage printouts
  perf stat: Add -d -d and -d -d -d options to show more CPU events
  ftrace/kbuild: Add recordmcount files to force full build
  ftrace: Add self-tests for multiple function trace users
  ftrace: Modify ftrace_set_filter/notrace to take ops
  ftrace: Allow dynamically allocated function tracers
  ftrace: Implement separate user function filtering
  ftrace: Free hash with call_rcu_sched()
  ftrace: Have global_ops store the functions that are to be traced
  ftrace: Add ops parameter to ftrace_startup/shutdown functions
  ftrace: Add enabled_functions file
  ftrace: Use counters to enable functions to trace
  ftrace: Separate hash allocation and assignment
  ftrace: Create a global_ops to hold the filter and notrace hashes
  ftrace: Use hash instead for FTRACE_FL_FILTER
  ftrace: Replace FTRACE_FL_NOTRACE flag with a hash of ignored functions
  perf bench, x86: Add alternatives-asm.h wrapper
  x86, 64-bit: Fix copy_[to/from]_user() checks for the userspace address limit
  x86, mem: memset_64.S: Optimize memset by enhanced REP MOVSB/STOSB
  x86, mem: memmove_64.S: Optimize memmove by enhanced REP MOVSB/STOSB
  ...
parents acd30250 29510ec3

Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1268,6 +1268,7 @@ help: 
	@echo  '  make C=1   [targets] Check all c source with $$CHECK (sparse by default)'

	@echo  '  make C=2   [targets] Force check of all c source with $$CHECK'

	@echo  '  make W=1   [targets] Enable extra gcc checks'

	@echo  '  make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'

	@echo  ''

	@echo  'Execute "make" or "make all" to build all targets marked with [*] '

	@echo  'For further info see the ./README file'

arch/mips/include/asm/jump_label.h

+12 −10
Original line number Diff line number Diff line
@@ -20,16 +20,18 @@ 
#define WORD_INSN ".word"

#endif



#define JUMP_LABEL(key, label)						\

	do {								\

		asm goto("1:\tnop\n\t"					\

			"nop\n\t"					\

			".pushsection __jump_table,  \"a\"\n\t"		\

			WORD_INSN " 1b, %l[" #label "], %0\n\t"		\

			".popsection\n\t"				\

			: :  "i" (key) :  : label);			\

	} while (0)



static __always_inline bool arch_static_branch(struct jump_label_key *key)

{

	asm goto("1:\tnop\n\t"

		"nop\n\t"

		".pushsection __jump_table,  \"aw\"\n\t"

		WORD_INSN " 1b, %l[l_yes], %0\n\t"

		".popsection\n\t"

		: :  "i" (key) : : l_yes);

	return false;

l_yes:

	return true;

}



#endif /* __KERNEL__ */

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ config S390 
	select HAVE_KERNEL_XZ

	select HAVE_GET_USER_PAGES_FAST

	select HAVE_ARCH_MUTEX_CPU_RELAX

	select HAVE_ARCH_JUMP_LABEL if !MARCH_G5

	select ARCH_INLINE_SPIN_TRYLOCK

	select ARCH_INLINE_SPIN_TRYLOCK_BH

	select ARCH_INLINE_SPIN_LOCK

arch/s390/include/asm/ftrace.h

+1 −3
Original line number Diff line number Diff line
@@ -11,15 +11,13 @@ struct dyn_arch_ftrace { }; 


#ifdef CONFIG_64BIT

#define MCOUNT_INSN_SIZE  12

#define MCOUNT_OFFSET	   8

#else

#define MCOUNT_INSN_SIZE  20

#define MCOUNT_OFFSET	   4

#endif



static inline unsigned long ftrace_call_adjust(unsigned long addr)

{

	return addr - MCOUNT_OFFSET;

	return addr;

}



#endif /* __ASSEMBLY__ */

arch/s390/include/asm/jump_label.h

0 → 100644
+37 −0
Original line number Diff line number Diff line 
#ifndef _ASM_S390_JUMP_LABEL_H

#define _ASM_S390_JUMP_LABEL_H



#include <linux/types.h>



#define JUMP_LABEL_NOP_SIZE 6



#ifdef CONFIG_64BIT

#define ASM_PTR ".quad"

#define ASM_ALIGN ".balign 8"

#else

#define ASM_PTR ".long"

#define ASM_ALIGN ".balign 4"

#endif



static __always_inline bool arch_static_branch(struct jump_label_key *key)

{

	asm goto("0:	brcl 0,0\n"

		".pushsection __jump_table, \"aw\"\n"

		ASM_ALIGN "\n"

		ASM_PTR " 0b, %l[label], %0\n"

		".popsection\n"

		: : "X" (key) : : label);

	return false;

label:

	return true;

}



typedef unsigned long jump_label_t;



struct jump_entry {

	jump_label_t code;

	jump_label_t target;

	jump_label_t key;

};



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE