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

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

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

Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
parents 94692349 f2963886

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/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/x86/include/asm/ftrace.h

+3 −4
Original line number Diff line number Diff line
@@ -38,11 +38,10 @@ extern void mcount(void); 
static inline unsigned long ftrace_call_adjust(unsigned long addr)

{

	/*

	 * call mcount is "e8 <4 byte offset>"

	 * The addr points to the 4 byte offset and the caller of this

	 * function wants the pointer to e8. Simply subtract one.

	 * addr is the address of the mcount call instruction.

	 * recordmcount does the necessary offset calculation.

	 */

	return addr - 1;

	return addr;

}



#ifdef CONFIG_DYNAMIC_FTRACE

arch/x86/include/asm/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ void *extend_brk(size_t size, size_t align); 
 * executable.)

 */

#define RESERVE_BRK(name,sz)						\

	static void __section(.discard.text) __used			\

	static void __section(.discard.text) __used notrace		\

	__brk_reservation_fn_##name##__(void) {				\

		asm volatile (						\

			".pushsection .brk_reservation,\"aw\",@nobits;" \

include/linux/init.h

+7 −7
Original line number Diff line number Diff line
@@ -79,29 +79,29 @@ 
#define __exitused  __used

#endif



#define __exit          __section(.exit.text) __exitused __cold

#define __exit          __section(.exit.text) __exitused __cold notrace



/* Used for HOTPLUG */

#define __devinit        __section(.devinit.text) __cold

#define __devinit        __section(.devinit.text) __cold notrace

#define __devinitdata    __section(.devinit.data)

#define __devinitconst   __section(.devinit.rodata)

#define __devexit        __section(.devexit.text) __exitused __cold

#define __devexit        __section(.devexit.text) __exitused __cold notrace

#define __devexitdata    __section(.devexit.data)

#define __devexitconst   __section(.devexit.rodata)



/* Used for HOTPLUG_CPU */

#define __cpuinit        __section(.cpuinit.text) __cold

#define __cpuinit        __section(.cpuinit.text) __cold notrace

#define __cpuinitdata    __section(.cpuinit.data)

#define __cpuinitconst   __section(.cpuinit.rodata)

#define __cpuexit        __section(.cpuexit.text) __exitused __cold

#define __cpuexit        __section(.cpuexit.text) __exitused __cold notrace

#define __cpuexitdata    __section(.cpuexit.data)

#define __cpuexitconst   __section(.cpuexit.rodata)



/* Used for MEMORY_HOTPLUG */

#define __meminit        __section(.meminit.text) __cold

#define __meminit        __section(.meminit.text) __cold notrace

#define __meminitdata    __section(.meminit.data)

#define __meminitconst   __section(.meminit.rodata)

#define __memexit        __section(.memexit.text) __exitused __cold

#define __memexit        __section(.memexit.text) __exitused __cold notrace

#define __memexitdata    __section(.memexit.data)

#define __memexitconst   __section(.memexit.rodata)