The following changes since commit c935a77de4f03d4bb5627e1d3cce2033e0d83937: Andy Whitcroft (1): UBUNTU: Ubuntu-2.6.32-9.13 are available in the git repository at: git://kernel.ubuntu.com/rtg/ubuntu-lucid lp497989 Tim Gardner (1): UBUNTU: [Config] Enable CONFIG_FUNCTION_TRACER debian.master/config/config.common.ports | 8 +++++++- debian.master/config/config.common.ubuntu | 10 +++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) >From 3dc9bdcdd2935fc57ba50c2eb90a6d383d9bf489 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Thu, 17 Dec 2009 20:18:07 -0700 Subject: [PATCH] UBUNTU: [Config] Enable CONFIG_FUNCTION_TRACER BugLink: http://bugs.launchpad.net/bugs/497989 Signed-off-by: Tim Gardner --- debian.master/config/config.common.ports | 8 +++++++- debian.master/config/config.common.ubuntu | 10 +++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports index ca31a05..c7cd79c 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -805,6 +805,7 @@ CONFIG_DVB_ZL10036=m CONFIG_DVB_ZL10039=m CONFIG_DVB_ZL10353=m # CONFIG_DYNAMIC_DEBUG is not set +CONFIG_DYNAMIC_FTRACE=y CONFIG_E100=m CONFIG_E1000=m CONFIG_E1000E=m @@ -975,6 +976,7 @@ CONFIG_FONT_SUN8x16=y CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAME_POINTER=y CONFIG_FRAME_WARN=1024 CONFIG_FREEZER=y # CONFIG_FSAM7400 is not set @@ -989,9 +991,12 @@ CONFIG_FS_MBCACHE=y CONFIG_FS_POSIX_ACL=y CONFIG_FTL=m CONFIG_FTRACE=y +CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set # CONFIG_FTR_FIXUP_SELFTEST is not set -# CONFIG_FUNCTION_TRACER is not set +CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_FUNCTION_PROFILER is not set +CONFIG_FUNCTION_TRACER=y CONFIG_FUSE_FS=y CONFIG_FUSION=y CONFIG_FUSION_CTL=m @@ -1699,6 +1704,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MARVELL_PHY=m CONFIG_MAX_RAW_DEVS=256 CONFIG_MCKINLEY=y +CONFIG_MCOUNT=y CONFIG_MCP2120_DONGLE=m CONFIG_MCS_FIR=m CONFIG_MD=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index bea83c6..a235de2 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -957,6 +957,7 @@ CONFIG_DVB_ZL10039=m CONFIG_DVB_ZL10353=m CONFIG_DX_SEP=m # CONFIG_DYNAMIC_DEBUG is not set +CONFIG_DYNAMIC_FTRACE=y CONFIG_E100=m CONFIG_E1000=m CONFIG_E1000E=m @@ -1014,7 +1015,6 @@ CONFIG_ELMC=m CONFIG_ELMC_II=m CONFIG_ELPLUS=m # CONFIG_EMBEDDED is not set -# CONFIG_ENABLE_DEFAULT_TRACERS is not set # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENC28J60 is not set @@ -1198,11 +1198,15 @@ CONFIG_FSNOTIFY=y CONFIG_FS_MBCACHE=y CONFIG_FS_POSIX_ACL=y CONFIG_FTRACE=y +CONFIG_FTRACE_MCOUNT_RECORD=y +CONFIG_FTRACE_NMI_ENTER=y # CONFIG_FTRACE_STARTUP_TEST is not set # CONFIG_FTRACE_SYSCALLS is not set CONFIG_FUJITSU_LAPTOP=m # CONFIG_FUJITSU_LAPTOP_DEBUG is not set -# CONFIG_FUNCTION_TRACER is not set +CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_FUNCTION_PROFILER is not set +CONFIG_FUNCTION_TRACER=y CONFIG_FUSE_FS=y CONFIG_FUSION=y CONFIG_FUSION_CTL=m @@ -1285,6 +1289,7 @@ CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y @@ -1914,7 +1919,6 @@ CONFIG_KGDB=y CONFIG_KGDB_SERIAL_CONSOLE=y # CONFIG_KGDB_TESTS is not set CONFIG_KINGSUN_DONGLE=m -# CONFIG_KMEMCHECK is not set # CONFIG_KMEMTRACE is not set CONFIG_KPROBES=y # CONFIG_KPROBES_SANITY_TEST is not set -- 1.6.2.4