From 5a7c25c58bd59cdc911c63fd4a06aaafb0ce02c4 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Sat, 7 Jun 2008 11:23:01 +0000 Subject: [PATCH] topconfig: Enable PROFILING across all flavours. centralize PROFILING setting, shouldn't be disabled. svn path=/dists/trunk/linux-2.6/; revision=11539 --- debian/changelog | 1 + debian/config/alpha/config | 1 - debian/config/amd64/config | 1 - debian/config/arm/config.footbridge | 1 - debian/config/arm/config.iop32x | 1 - debian/config/arm/config.ixp4xx | 1 - debian/config/arm/config.versatile | 1 - debian/config/config | 1 + debian/config/hppa/config | 1 - debian/config/i386/config | 1 - debian/config/ia64/config | 1 - debian/config/mips/config.4kc-malta | 1 - debian/config/mips/config.5kc-malta | 1 - debian/config/mips/config.r4k-ip22 | 1 - debian/config/mips/config.r5k-ip32 | 1 - debian/config/mips/config.sb1-bcm91250a | 1 - debian/config/mips/config.sb1a-bcm91480b | 1 - debian/config/mipsel/config.4kc-malta | 1 - debian/config/mipsel/config.5kc-malta | 1 - debian/config/mipsel/config.r5k-cobalt | 1 - debian/config/mipsel/config.sb1-bcm91250a | 1 - debian/config/mipsel/config.sb1a-bcm91480b | 1 - debian/config/powerpc/config | 1 - debian/config/powerpc/config.powerpc-miboot | 1 - debian/config/s390/config | 5 ----- debian/config/sparc/config.sparc64 | 1 - debian/config/sparc/config.sparc64-smp | 1 - 27 files changed, 2 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index 580167917..58d549ce9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ linux-2.6 (2.6.26~rc5-1~experimental.1) UNRELEASED; urgency=low * [x86]: Enable dma engine. (closes: #473331) * iwl3945: Add monitor mode patch. (closes: #482387) * [ppc64]: Enable IBMEBUS and EHEA. (closes: #484888) + * topconfig: Enable PROFILING across all flavours. (closes: #484885) [ Martin Michlmayr ] * [arm/orion5x] Update the config to reflect upstream renaming this diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 747f6b2f6..ac1de3e93 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -1288,7 +1288,6 @@ CONFIG_SUN_PARTITION=y # CONFIG_AUDIT is not set CONFIG_LOG_BUF_SHIFT=14 # CONFIG_KALLSYMS_ALL is not set -CONFIG_PROFILING=y ## ## file: lib/Kconfig diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 0de7b326d..99a878168 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -1430,7 +1430,6 @@ CONFIG_UID16=y # CONFIG_KALLSYMS_ALL is not set CONFIG_HOTPLUG=y CONFIG_BASE_FULL=y -CONFIG_PROFILING=y ## ## file: kernel/Kconfig.hz diff --git a/debian/config/arm/config.footbridge b/debian/config/arm/config.footbridge index 21ad64968..8da54395f 100644 --- a/debian/config/arm/config.footbridge +++ b/debian/config/arm/config.footbridge @@ -1177,7 +1177,6 @@ CONFIG_BASE_FULL=y CONFIG_SLAB=y # CONFIG_SLOB is not set ## end choice -# CONFIG_PROFILING is not set CONFIG_MODULES=y CONFIG_KMOD=y diff --git a/debian/config/arm/config.iop32x b/debian/config/arm/config.iop32x index 393ff7baa..200aed5ba 100644 --- a/debian/config/arm/config.iop32x +++ b/debian/config/arm/config.iop32x @@ -734,7 +734,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_UID16=y CONFIG_HOTPLUG=y CONFIG_BASE_FULL=y -# CONFIG_PROFILING is not set CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx index 9df1b1c60..fcd536398 100644 --- a/debian/config/arm/config.ixp4xx +++ b/debian/config/arm/config.ixp4xx @@ -731,7 +731,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_UID16=y CONFIG_HOTPLUG=y CONFIG_BASE_FULL=y -# CONFIG_PROFILING is not set CONFIG_MODULES=y CONFIG_KMOD=y diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile index 308d03929..14af0ec0e 100644 --- a/debian/config/arm/config.versatile +++ b/debian/config/arm/config.versatile @@ -1201,7 +1201,6 @@ CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set ## end choice -# CONFIG_PROFILING is not set # CONFIG_MARKERS is not set CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y diff --git a/debian/config/config b/debian/config/config index 6355260f2..9523727d1 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1922,6 +1922,7 @@ CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set ## end choice +CONFIG_PROFILING=y # CONFIG_MARKERS is not set CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set diff --git a/debian/config/hppa/config b/debian/config/hppa/config index e0413021a..fa8743f20 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -663,7 +663,6 @@ CONFIG_LOG_BUF_SHIFT=15 # CONFIG_KALLSYMS_ALL is not set CONFIG_HOTPLUG=y CONFIG_BASE_FULL=y -CONFIG_PROFILING=y ## ## file: lib/Kconfig diff --git a/debian/config/i386/config b/debian/config/i386/config index e28757e44..7453214d0 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -1690,7 +1690,6 @@ CONFIG_EFI_PARTITION=y ## CONFIG_UID16=y # CONFIG_KALLSYMS_ALL is not set -CONFIG_PROFILING=y ## ## file: kernel/Kconfig.hz diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 79a28d5e2..0d579f534 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -925,7 +925,6 @@ CONFIG_EFI_PARTITION=y ## file: init/Kconfig ## CONFIG_LOG_BUF_SHIFT=16 -CONFIG_PROFILING=y ## ## file: kernel/power/Kconfig diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index a2752bc2d..32244c1e8 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1577,7 +1577,6 @@ CONFIG_BASE_FULL=y CONFIG_SLAB=y # CONFIG_SLOB is not set ## end choice -CONFIG_PROFILING=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index e1bd1cebd..ca33b0474 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1883,7 +1883,6 @@ CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set ## end choice -CONFIG_PROFILING=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index f8fc43f79..6b1c9edb9 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -543,7 +543,6 @@ CONFIG_BASE_FULL=y CONFIG_SLAB=y # CONFIG_SLOB is not set ## end choice -CONFIG_PROFILING=y CONFIG_MODULES=y CONFIG_KMOD=y diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index 276531dc2..6403c8d24 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -662,7 +662,6 @@ CONFIG_BASE_FULL=y CONFIG_SLAB=y # CONFIG_SLOB is not set ## end choice -CONFIG_PROFILING=y CONFIG_MODULES=y CONFIG_KMOD=y diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index 77f074e0b..1eac9deb2 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -313,7 +313,6 @@ CONFIG_BASE_FULL=y CONFIG_SLAB=y # CONFIG_SLOB is not set ## end choice -CONFIG_PROFILING=y CONFIG_MODULES=y CONFIG_KMOD=y diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index c633115b3..d5cda6d63 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -938,7 +938,6 @@ CONFIG_BASE_FULL=y CONFIG_SLAB=y # CONFIG_SLOB is not set ## end choice -CONFIG_PROFILING=y CONFIG_MODULES=y CONFIG_KMOD=y diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta index 20e635317..312b0a12e 100644 --- a/debian/config/mipsel/config.4kc-malta +++ b/debian/config/mipsel/config.4kc-malta @@ -1563,7 +1563,6 @@ CONFIG_BASE_FULL=y CONFIG_SLAB=y # CONFIG_SLOB is not set ## end choice -CONFIG_PROFILING=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta index 7edce918d..4cd230aca 100644 --- a/debian/config/mipsel/config.5kc-malta +++ b/debian/config/mipsel/config.5kc-malta @@ -1882,7 +1882,6 @@ CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set ## end choice -CONFIG_PROFILING=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index cdb43d4c8..9aa1a281d 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -811,7 +811,6 @@ CONFIG_BASE_FULL=y CONFIG_SLAB=y # CONFIG_SLOB is not set ## end choice -# CONFIG_PROFILING is not set CONFIG_MODULES=y CONFIG_KMOD=y diff --git a/debian/config/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a index 0024e3b61..69e898f4d 100644 --- a/debian/config/mipsel/config.sb1-bcm91250a +++ b/debian/config/mipsel/config.sb1-bcm91250a @@ -950,7 +950,6 @@ CONFIG_BASE_FULL=y CONFIG_SLAB=y # CONFIG_SLOB is not set ## end choice -CONFIG_PROFILING=y CONFIG_MODULES=y CONFIG_KMOD=y diff --git a/debian/config/mipsel/config.sb1a-bcm91480b b/debian/config/mipsel/config.sb1a-bcm91480b index 5a5b0b10f..b61e00d37 100644 --- a/debian/config/mipsel/config.sb1a-bcm91480b +++ b/debian/config/mipsel/config.sb1a-bcm91480b @@ -937,7 +937,6 @@ CONFIG_BASE_FULL=y CONFIG_SLAB=y # CONFIG_SLOB is not set ## end choice -CONFIG_PROFILING=y CONFIG_MODULES=y CONFIG_KMOD=y diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 30555b42e..fe6ee8a57 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -1003,7 +1003,6 @@ CONFIG_MAC_PARTITION=y ## # CONFIG_KALLSYMS_ALL is not set CONFIG_HOTPLUG=y -CONFIG_PROFILING=y ## ## file: kernel/power/Kconfig diff --git a/debian/config/powerpc/config.powerpc-miboot b/debian/config/powerpc/config.powerpc-miboot index 455f20912..ef4c0baf3 100644 --- a/debian/config/powerpc/config.powerpc-miboot +++ b/debian/config/powerpc/config.powerpc-miboot @@ -136,7 +136,6 @@ CONFIG_FB_VOODOO1=m CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y # CONFIG_BASE_FULL is not set -# CONFIG_PROFILING is not set ## ## file: kernel/power/Kconfig diff --git a/debian/config/s390/config b/debian/config/s390/config index fb0528949..5c99af840 100644 --- a/debian/config/s390/config +++ b/debian/config/s390/config @@ -157,11 +157,6 @@ CONFIG_BSD_DISKLABEL=y # CONFIG_SUN_PARTITION is not set # CONFIG_EFI_PARTITION is not set -## -## file: init/Kconfig -## -# CONFIG_PROFILING is not set - ## ## file: lib/Kconfig ## diff --git a/debian/config/sparc/config.sparc64 b/debian/config/sparc/config.sparc64 index bc87a7658..10e8da9d0 100644 --- a/debian/config/sparc/config.sparc64 +++ b/debian/config/sparc/config.sparc64 @@ -447,7 +447,6 @@ CONFIG_LOGO_SUN_CLUT224=y ## file: init/Kconfig ## CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_PROFILING is not set ## ## file: mm/Kconfig diff --git a/debian/config/sparc/config.sparc64-smp b/debian/config/sparc/config.sparc64-smp index b78c03b83..755c7e466 100644 --- a/debian/config/sparc/config.sparc64-smp +++ b/debian/config/sparc/config.sparc64-smp @@ -449,7 +449,6 @@ CONFIG_LOGO_SUN_CLUT224=y ## file: init/Kconfig ## CONFIG_LOG_BUF_SHIFT=15 -# CONFIG_PROFILING is not set ## ## file: mm/Kconfig