rpms/kernel/F-11 Makefile, 1.101, 1.102 config-debug, 1.23, 1.24 config-nodebug, 1.32, 1.33 config-x86-generic, 1.73, 1.74 config-x86_64-generic, 1.73, 1.74 kernel.spec, 1.1519, 1.1520

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1413

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/F-11/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:33:29 -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/F-11/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:33:30 -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/F-11/config-nodebug,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- config-nodebug	3 Apr 2009 00:34:25 -0000	1.32
+++ config-nodebug	8 Apr 2009 15:33:30 -0000	1.33
@@ -47,3 +47,5 @@
 # CONFIG_DEBUG_NOTIFIERS is not set
 
 # CONFIG_DMA_API_DEBUG is not set
+
+# CONFIG_MMIOTRACE is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-x86-generic,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- config-x86-generic	19 Mar 2009 20:43:22 -0000	1.73
+++ config-x86-generic	8 Apr 2009 15:33:30 -0000	1.74
@@ -413,7 +413,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/F-11/config-x86_64-generic,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- config-x86_64-generic	3 Apr 2009 00:34:25 -0000	1.73
+++ config-x86_64-generic	8 Apr 2009 15:33:30 -0000	1.74
@@ -317,7 +317,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/F-11/kernel.spec,v
retrieving revision 1.1519
retrieving revision 1.1520
diff -u -r1.1519 -r1.1520
--- kernel.spec	8 Apr 2009 05:01:17 -0000	1.1519
+++ kernel.spec	8 Apr 2009 15:33:30 -0000	1.1520
@@ -1905,6 +1905,9 @@
 # and build.
 
 %changelog
+* Wed Apr 08 2009 Dave Jones <davej at redhat.com> 2.6.29.1-58
+- disable MMIOTRACE in non-debug builds (#494584)
+
 * Wed Apr 08 2009 Ben Skeggs <bskeggs at redhat.com>
 - drm-nouveau.patch: nv50 kms fixes (PROM access, i2c, clean some warnings)