Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55a32030 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irqdomain/merge' of git://git.secretlab.ca/git/linux-2.6 

Pull the code to generalize the powerpc VIRQ_DEBUG code from Grant Likely.

That code had been moved into generic irqdomain code, but still had
powerpc-specific code and could only be enabled on powerpc.

* 'irqdomain/merge' of git://git.secretlab.ca/git/linux-2.6:
  irqdomain/powerpc: updated defconfigs for VIRQ_DEBUG rename
  irqdomain: Remove powerpc dependency from debugfs file
parents 18a06efa d4886bc6

arch/powerpc/Kconfig.debug

+0 −10
Original line number Diff line number Diff line
@@ -114,16 +114,6 @@ config DEBUGGER 
	depends on KGDB || XMON

	default y



config VIRQ_DEBUG

	bool "Expose hardware/virtual IRQ mapping via debugfs"

	depends on DEBUG_FS

	help

	  This option will show the mapping relationship between hardware irq

	  numbers and virtual irq numbers. The mapping is exposed via debugfs

	  in the file powerpc/virq_mapping.



	  If you don't know what this means you don't need it.



config BDI_SWITCH

	bool "Include BDI-2000 user context switcher"

	depends on DEBUG_KERNEL && PPC32

arch/powerpc/configs/85xx/p1023rds_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ CONFIG_DETECT_HUNG_TASK=y 
CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_VIRQ_DEBUG=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_SHA512=y

arch/powerpc/configs/chroma_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ CONFIG_FTRACE_SYSCALLS=y 
CONFIG_PPC_EMULATED_STATS=y

CONFIG_XMON=y

CONFIG_XMON_DEFAULT=y

CONFIG_VIRQ_DEBUG=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_PPC_EARLY_DEBUG=y

CONFIG_KEYS_DEBUG_PROC_KEYS=y

CONFIG_CRYPTO_NULL=m

arch/powerpc/configs/corenet64_smp_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ CONFIG_DEBUG_FS=y 
CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_INFO=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_VIRQ_DEBUG=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_SHA512=y

arch/powerpc/configs/mpc85xx_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ CONFIG_DEBUG_FS=y 
CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_INFO=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_VIRQ_DEBUG=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_SHA512=y