Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5a2bad5 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/perf/core' of... 

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
parents d0303d71 46eb3b64

Makefile

+5 −0
Original line number Diff line number Diff line
@@ -591,6 +591,11 @@ KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow) 
# conserve stack if available

KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)



# check for 'asm goto'

ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y)

	KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO

endif



# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments

# But warn user when we do so

warn-assign = \

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -158,4 +158,7 @@ config HAVE_PERF_EVENTS_NMI 
	  subsystem.  Also has support for calculating CPU cycle events

	  to determine how many clock cycles in a given period.



config HAVE_ARCH_JUMP_LABEL

	bool



source "kernel/gcov/Kconfig"

arch/sparc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ config SPARC 
	select PERF_USE_VMALLOC

	select HAVE_DMA_ATTRS

	select HAVE_DMA_API_DEBUG

	select HAVE_ARCH_JUMP_LABEL



config SPARC32

	def_bool !64BIT

arch/sparc/include/asm/jump_label.h

0 → 100644
+32 −0
Original line number Diff line number Diff line 
#ifndef _ASM_SPARC_JUMP_LABEL_H

#define _ASM_SPARC_JUMP_LABEL_H



#ifdef __KERNEL__



#include <linux/types.h>

#include <asm/system.h>



#define JUMP_LABEL_NOP_SIZE 4



#define JUMP_LABEL(key, label)					\

	do {							\

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

			 "nop\n\t"				\

			 "nop\n\t"				\

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

			 ".word 1b, %l[" #label "], %c0\n\t"	\

			 ".popsection \n\t"			\

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

	} while (0)



#endif /* __KERNEL__ */



typedef u32 jump_label_t;



struct jump_entry {

	jump_label_t code;

	jump_label_t target;

	jump_label_t key;

};



#endif

arch/sparc/kernel/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -119,3 +119,5 @@ obj-$(CONFIG_COMPAT) += $(audit--y) 


pc--$(CONFIG_PERF_EVENTS) := perf_event.o

obj-$(CONFIG_SPARC64)	+= $(pc--y)



obj-$(CONFIG_SPARC64)	+= jump_label.o