The patch titled DEBUG_SHIRQ should depend on DEBUG_KERNEL has been added to the -mm tree. Its filename is debug-shared-irqs-kconfig-fix.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: DEBUG_SHIRQ should depend on DEBUG_KERNEL From: Adrian Bunk <bunk@xxxxxxxxx> DEBUG_SHIRQ is clearly a debugging option. While moving the option below DEBUG_KERNEL, I also adjusted the help text to be completely visible in "make menuconfig" with a 80 char width. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- lib/Kconfig.debug | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff -puN lib/Kconfig.debug~debug-shared-irqs-kconfig-fix lib/Kconfig.debug --- a/lib/Kconfig.debug~debug-shared-irqs-kconfig-fix +++ a/lib/Kconfig.debug @@ -46,21 +46,21 @@ config UNUSED_SYMBOLS you really need it, and what the merge plan to the mainline kernel for your module is. -config DEBUG_SHIRQ - bool "Debug shared IRQ handlers" - depends on GENERIC_HARDIRQS - help - Enable this to generate a spurious interrupt as soon as a shared interrupt - handler is registered, and just before one is deregistered. Drivers ought - to be able to handle interrupts coming in at those points; some don't and - need to be caught. - config DEBUG_KERNEL bool "Kernel debugging" help Say Y here if you are developing drivers or trying to debug and identify kernel problems. +config DEBUG_SHIRQ + bool "Debug shared IRQ handlers" + depends on DEBUG_KERNEL && GENERIC_HARDIRQS + help + Enable this to generate a spurious interrupt as soon as a shared + interrupt handler is registered, and just before one is deregistered. + Drivers ought to be able to handle interrupts coming in at those + points; some don't and need to be caught. + config LOG_BUF_SHIFT int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" if DEBUG_KERNEL range 12 21 _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch git-arm.patch git-cpufreq.patch git-gfs2.patch if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch make-variables-static-after-klibc-merge.patch git-libata-all.patch git-mtd.patch drivers-net-e1000-possible-cleanups.patch fs-nfs-make-2-functions-static.patch fs-nfs-make-code-static.patch git-ocfs2.patch git-pcmcia.patch include-scsi-libsash-should-include-linux-scatterlisth.patch gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch git-scsi-rc-fixes.patch drivers-scsi-aic7xxx-possible-cleanups.patch drivers-scsi-small-cleanups.patch drivers-scsi-qla2xxx-make-some-functions-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-aic7xxx-possible-cleanups-2.patch drivers-scsi-advansysc-cleanups.patch make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch megaraid-fix-warnings-when-config_proc_fs=n.patch areca-raid-linux-scsi-driver.patch mm-make-functions-static.patch acx1xx-wireless-driver.patch drivers-edac-make-code-static.patch inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch reiserfs-warn-about-the-useless-nolargeio-option.patch x86-microcode-add-sysfs-and-hotplug-support-fix-fix-2.patch null-terminate-over-long-proc-kallsyms-symbols-fix.patch remove-kernel-kthreadckthread_stop_sem.patch drivers-block-cpqarrayc-remove-an-unused-variable.patch unexport-open_softirq.patch let-the-the-lockdep-options-depend-on-debug_kernel.patch task-watchers-register-semundo-task-watcher.patch fs-ecryptfs-possible-cleanups.patch ecryptfs-add-a-maintainers-entry.patch make-kernel-sysctlc_proc_do_string-static.patch namespaces-utsname-sysctl-hack-fix.patch namespaces-utsname-implement-clone_newuts-flag.patch fs-reiser4-possible-cleanups.patch drivers-ide-cleanups.patch srcu-3-add-srcu-operations-to-rcutorture-fix.patch the-scheduled-removal-of-some-oss-drivers.patch the-scheduled-removal-of-some-oss-drivers-fix.patch the-scheduled-removal-of-some-oss-drivers-fix-fix.patch kill-sound-oss-_symsc.patch slab-cache-shrinker-statistics.patch debug-shared-irqs-kconfig-fix.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html