Merge branch 'tracing-fixes-for-linus' of... (e946217e) · Commits · 戴 / test

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (31 commits) ftrace: fix current_tracer error return tracing: fix a build error on alpha ftrace: use a real variable for ftrace_nop in x86 tracing/ftrace: make boot tracer select the sched_switch tracer tracepoint: check if the probe has been registered asm-generic: define DIE_OOPS in asm-generic trace: fix printk warning for u64 ftrace: warning in kernel/trace/ftrace.c ftrace: fix build failure ftrace, powerpc, sparc64, x86: remove notrace from arch ftrace file ftrace: remove ftrace hash ftrace: remove mcount set ftrace: remove daemon ftrace: disable dynamic ftrace for all archs that use daemon ftrace: add ftrace warn on to disable ftrace ftrace: only have ftrace_kill atomic ftrace: use probe_kernel ftrace: comment arch ftrace code ftrace: return error on failed modified text. ftrace: dynamic ftrace process only text section ...

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -536,7 +536,7 @@ KBUILD_CFLAGS += -g
		KBUILD_AFLAGS += -gdwarf-2
		endif

		ifdef CONFIG_FTRACE
		ifdef CONFIG_FUNCTION_TRACER
		KBUILD_CFLAGS += -pg
		endif

arch/arm/Kconfig

+1 −2

Original line number	Diff line number	Diff line
		@@ -16,8 +16,7 @@ config ARM
		select HAVE_ARCH_KGDB
		select HAVE_KPROBES if (!XIP_KERNEL)
		select HAVE_KRETPROBES if (HAVE_KPROBES)
		select HAVE_FTRACE if (!XIP_KERNEL)
		select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE)
		select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
		select HAVE_GENERIC_DMA_COHERENT
		help
		The ARM series is a line of low-power-consumption RISC chip designs

arch/arm/boot/compressed/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
		targets := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \
		head.o misc.o $(OBJS)

		ifeq ($(CONFIG_FTRACE),y)
		ifeq ($(CONFIG_FUNCTION_TRACER),y)
		ORIG_CFLAGS := $(KBUILD_CFLAGS)
		KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
		endif

arch/arm/include/asm/ftrace.h

+1 −1

Original line number	Diff line number	Diff line
		#ifndef _ASM_ARM_FTRACE
		#define _ASM_ARM_FTRACE

		#ifdef CONFIG_FTRACE
		#ifdef CONFIG_FUNCTION_TRACER
		#define MCOUNT_ADDR ((long)(mcount))
		#define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */

arch/arm/kernel/armksyms.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -183,6 +183,6 @@ EXPORT_SYMBOL(_find_next_bit_be);

		EXPORT_SYMBOL(copy_page);

		#ifdef CONFIG_FTRACE
		#ifdef CONFIG_FUNCTION_TRACER
		EXPORT_SYMBOL(mcount);
		#endif

Admin message