diff --git a/debian/changelog b/debian/changelog index 3e631802e..39b683aa0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -77,7 +77,8 @@ linux-2.6 (2.6.25~rc7-1~experimental.1) UNRELEASED; urgency=low - Broadcom NetXtremeII support * [powerpc] Use new wrapper install support. * [s390] Enable DM_MULTIPATH_EMC. - * Enable AF_RXRPC, RXKAD, PRINTK_TIME, DEBUG_KERNEL. + * Enable AF_RXRPC, RXKAD, PRINTK_TIME, DEBUG_KERNEL, SCHED_DEBUG, + TIMER_STATS. * Disable R3964, USB_GADGET. * [hppa] Enable several filesystems. * Make NLS modular. diff --git a/debian/config/amd64/config b/debian/config/amd64/config index adf9886c6..9198442b3 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -1470,7 +1470,6 @@ CONFIG_CRC32=y ## file: lib/Kconfig.debug ## # CONFIG_DEBUG_SHIRQ is not set -CONFIG_TIMER_STATS=y # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_LOCK_STAT is not set diff --git a/debian/config/config b/debian/config/config index d455ad86f..97792d021 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1874,8 +1874,9 @@ CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y CONFIG_DETECT_SOFTLOCKUP=y -# CONFIG_SCHED_DEBUG is not set +CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set +CONFIG_TIMER_STATS=y # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_MUTEXES is not set diff --git a/debian/config/i386/config b/debian/config/i386/config index 5f1836700..bbc109e9e 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -1729,7 +1729,6 @@ CONFIG_CRC32=y ## file: lib/Kconfig.debug ## # CONFIG_DEBUG_SHIRQ is not set -CONFIG_TIMER_STATS=y # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_LOCK_STAT is not set