rpms/kernel/devel Makefile, 1.101, 1.102 config-debug, 1.23, 1.24 config-nodebug, 1.31, 1.32 config-x86-generic, 1.76, 1.77 config-x86_64-generic, 1.76, 1.77 kernel.spec, 1.1506, 1.1507

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3092

Modified Files:
	Makefile config-debug config-nodebug config-x86-generic 
	config-x86_64-generic kernel.spec 
Log Message:
disable MMIOTRACE in non-debug builds (#494584)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- Makefile	24 Mar 2009 01:31:28 -0000	1.101
+++ Makefile	8 Apr 2009 15:39:50 -0000	1.102
@@ -70,6 +70,7 @@
 	@perl -pi -e 's/# CONFIG_PCI_MSI_DEFAULT_ON is not set/CONFIG_PCI_MSI_DEFAULT_ON=y/' config-generic
 	@perl -pi -e 's/# CONFIG_B43_DEBUG is not set/CONFIG_B43_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_B43LEGACY_DEBUG is not set/CONFIG_B43LEGACY_DEBUG=y/' config-generic
+	@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug
 
 	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
@@ -114,6 +115,7 @@
 	@perl -pi -e 's/CONFIG_PCI_MSI_DEFAULT_ON=y/# CONFIG_PCI_MSI_DEFAULT_ON is not set/' config-generic
 	@perl -pi -e 's/CONFIG_B43_DEBUG=y/# CONFIG_B43_DEBUG is not set/' config-generic
 	@perl -pi -e 's/CONFIG_B43LEGACY_DEBUG=y/# CONFIG_B43LEGACY_DEBUG is not set/' config-generic
+	@perl -pi -e 's/CONFIG_MMIOTRACE=y/# CONFIG_MMIOTRACE is not set/' config-nodebug
 
 	@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
 


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- config-debug	5 Feb 2009 19:02:18 -0000	1.23
+++ config-debug	8 Apr 2009 15:39:50 -0000	1.24
@@ -48,3 +48,5 @@
 CONFIG_DEBUG_NOTIFIERS=y
 
 CONFIG_DMA_API_DEBUG=y
+
+CONFIG_MMIOTRACE=y


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- config-nodebug	5 Feb 2009 21:11:18 -0000	1.31
+++ config-nodebug	8 Apr 2009 15:39:50 -0000	1.32
@@ -47,3 +47,5 @@
 CONFIG_DEBUG_NOTIFIERS=y
 
 CONFIG_DMA_API_DEBUG=y
+
+CONFIG_MMIOTRACE=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- config-x86-generic	6 Apr 2009 15:44:28 -0000	1.76
+++ config-x86-generic	8 Apr 2009 15:39:51 -0000	1.77
@@ -428,7 +428,6 @@
 CONFIG_SYSPROF_TRACER=y
 
 # CONFIG_X86_VERBOSE_BOOTUP is not set
-CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 
 # CONFIG_DEBUG_PER_CPU_MAPS is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- config-x86_64-generic	7 Apr 2009 17:13:39 -0000	1.76
+++ config-x86_64-generic	8 Apr 2009 15:39:51 -0000	1.77
@@ -328,7 +328,6 @@
 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_SYSPROF_TRACER=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
-CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 
 CONFIG_X86_MPPARSE=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1506
retrieving revision 1.1507
diff -u -r1.1506 -r1.1507
--- kernel.spec	8 Apr 2009 05:16:24 -0000	1.1506
+++ kernel.spec	8 Apr 2009 15:39:51 -0000	1.1507
@@ -1822,6 +1822,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Wed Apr 08 2009 Dave Jones <davej at redhat.com>
+- disable MMIOTRACE in non-debug builds (#494584)
+
 * Wed Apr 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.44.rc1
 - 2.6.30-rc1
 - linux-2.6-hwmon-atk0110.patch: drop