rpms/kernel/devel Makefile, 1.126, 1.126.8.1 config-debug, 1.42, 1.42.8.1 config-generic, 1.369, 1.369.2.1 config-nodebug, 1.57, 1.57.2.1 kernel.spec, 1.2037.2.8, 1.2037.2.9

Tue Jul 6 13:17:06 UTC 2010

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25926

Modified Files:
      Tag: private-f14-2_6_34
	Makefile config-debug config-generic config-nodebug 
	kernel.spec 
Log Message:
Re-enable options: DYNAMIC_FTRACE, FUNCTION_TRACER and STACK_TRACER


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.126
retrieving revision 1.126.8.1
diff -u -p -r1.126 -r1.126.8.1

--- Makefile	21 Apr 2010 17:11:52 -0000	1.126
+++ Makefile	6 Jul 2010 13:17:05 -0000	1.126.8.1
@@ -86,9 +86,6 @@ debug:
 	@perl -pi -e 's/# CONFIG_EXT4_DEBUG is not set/CONFIG_EXT4_DEBUG=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_PERF_USE_VMALLOC is not set/CONFIG_DEBUG_PERF_USE_VMALLOC=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_JBD2_DEBUG is not set/CONFIG_JBD2_DEBUG=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_FUNCTION_TRACER is not set/CONFIG_FUNCTION_TRACER=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_STACK_TRACER is not set/CONFIG_STACK_TRACER=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DYNAMIC_FTRACE is not set/CONFIG_DYNAMIC_FTRACE=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_CFQ_IOSCHED is not set/CONFIG_DEBUG_CFQ_IOSCHED=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DRBD_FAULT_INJECTION is not set/CONFIG_DRBD_FAULT_INJECTION=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_ATH_DEBUG is not set/CONFIG_ATH_DEBUG=y/' config-nodebug
@@ -153,9 +150,6 @@ release:
 	@perl -pi -e 's/CONFIG_EXT4_DEBUG=y/# CONFIG_EXT4_DEBUG is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_PERF_USE_VMALLOC=y/# CONFIG_DEBUG_PERF_USE_VMALLOC is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_JBD2_DEBUG=y/# CONFIG_JBD2_DEBUG is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_FUNCTION_TRACER=y/# CONFIG_FUNCTION_TRACER is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_STACK_TRACER=y/# CONFIG_STACK_TRACER is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DYNAMIC_FTRACE=y/# CONFIG_DYNAMIC_FTRACE is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_CFQ_IOSCHED=y/# CONFIG_DEBUG_CFQ_IOSCHED is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DRBD_FAULT_INJECTION=y/# CONFIG_DRBD_FAULT_INJECTION is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_ATH_DEBUG=y/# CONFIG_ATH_DEBUG is not set/' config-nodebug


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.42
retrieving revision 1.42.8.1
diff -u -p -r1.42 -r1.42.8.1
--- config-debug	21 Apr 2010 17:11:52 -0000	1.42
+++ config-debug	6 Jul 2010 13:17:05 -0000	1.42.8.1
@@ -64,10 +64,6 @@ CONFIG_DEBUG_PERF_USE_VMALLOC=y
 
 CONFIG_JBD2_DEBUG=y
 
-CONFIG_FUNCTION_TRACER=y
-CONFIG_STACK_TRACER=y
-CONFIG_DYNAMIC_FTRACE=y
-
 CONFIG_DEBUG_CFQ_IOSCHED=y
 
 CONFIG_DRBD_FAULT_INJECTION=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.369
retrieving revision 1.369.2.1
diff -u -p -r1.369 -r1.369.2.1
--- config-generic	9 Jun 2010 19:59:34 -0000	1.369
+++ config-generic	6 Jul 2010 13:17:05 -0000	1.369.2.1
@@ -3845,6 +3845,9 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_TRACE_BRANCH_PROFILING is not set
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_RING_BUFFER_BENCHMARK=m
+CONFIG_FUNCTION_TRACER=y
+CONFIG_STACK_TRACER=y
+CONFIG_DYNAMIC_FTRACE=y
 
 CONFIG_KPROBES=y
 CONFIG_OPTPROBES=y


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.57
retrieving revision 1.57.2.1
diff -u -p -r1.57 -r1.57.2.1
--- config-nodebug	2 Jun 2010 12:03:11 -0000	1.57
+++ config-nodebug	6 Jul 2010 13:17:05 -0000	1.57.2.1
@@ -64,10 +64,6 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 
 # CONFIG_JBD2_DEBUG is not set
 
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_DYNAMIC_FTRACE is not set
-
 # CONFIG_DEBUG_CFQ_IOSCHED is not set
 
 # CONFIG_DRBD_FAULT_INJECTION is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2037.2.8
retrieving revision 1.2037.2.9
diff -u -p -r1.2037.2.8 -r1.2037.2.9
--- kernel.spec	6 Jul 2010 08:11:03 -0000	1.2037.2.8
+++ kernel.spec	6 Jul 2010 13:17:05 -0000	1.2037.2.9
@@ -1976,6 +1976,9 @@ fi
 
 
 %changelog
+* Tue Jul 06 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.1-46.2.9
+- Re-enable options: DYNAMIC_FTRACE, FUNCTION_TRACER and STACK_TRACER
+
 * Tue Jul 06 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.1-46.2.8
 - Linux 2.6.34.1
 

