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

Commit cc1b39db authored Dec 08, 2012 by Ingo Molnar

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

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

 into perf/core

Pull ftrace updates from Steve Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents 7e0dd574 1c7d6673

arch/alpha/include/asm/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,3 +11,4 @@ header-y += reg.h
		header-y += regdef.h
		header-y += sysinfo.h
		generic-y += exec.h
		generic-y += trace_clock.h

arch/arm/include/asm/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		@@ -31,5 +31,6 @@ generic-y += sockios.h
		generic-y += termbits.h
		generic-y += termios.h
		generic-y += timex.h
		generic-y += trace_clock.h
		generic-y += types.h
		generic-y += unaligned.h

arch/arm64/include/asm/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ generic-y += swab.h
		generic-y += termbits.h
		generic-y += termios.h
		generic-y += topology.h
		generic-y += trace_clock.h
		generic-y += types.h
		generic-y += unaligned.h
		generic-y += user.h

arch/avr32/include/asm/Kbuild

+1 −0

Original line number	Diff line number	Diff line

		generic-y += clkdev.h
		generic-y += exec.h
		generic-y += trace_clock.h

arch/blackfin/include/asm/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ generic-y += statfs.h
		generic-y += termbits.h
		generic-y += termios.h
		generic-y += topology.h
		generic-y += trace_clock.h
		generic-y += types.h
		generic-y += ucontext.h
		generic-y += unaligned.h