From: Ingo Molnar NMIs are not working yet under LOCKDEP, so make sure they are disabled. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton --- arch/i386/oprofile/Kconfig | 2 +- arch/x86_64/oprofile/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN arch/i386/oprofile/Kconfig~lock-validator-disable-oprofile-if-lockdep=y arch/i386/oprofile/Kconfig --- devel/arch/i386/oprofile/Kconfig~lock-validator-disable-oprofile-if-lockdep=y 2006-05-30 17:59:19.000000000 -0700 +++ devel-akpm/arch/i386/oprofile/Kconfig 2006-05-30 17:59:19.000000000 -0700 @@ -7,7 +7,7 @@ config PROFILING config OPROFILE tristate "OProfile system profiling (EXPERIMENTAL)" - depends on PROFILING + depends on PROFILING && !LOCKDEP help OProfile is a profiling system capable of profiling the whole system, include the kernel, kernel modules, libraries, diff -puN arch/x86_64/oprofile/Kconfig~lock-validator-disable-oprofile-if-lockdep=y arch/x86_64/oprofile/Kconfig --- devel/arch/x86_64/oprofile/Kconfig~lock-validator-disable-oprofile-if-lockdep=y 2006-05-30 17:59:19.000000000 -0700 +++ devel-akpm/arch/x86_64/oprofile/Kconfig 2006-05-30 17:59:19.000000000 -0700 @@ -7,7 +7,7 @@ config PROFILING config OPROFILE tristate "OProfile system profiling (EXPERIMENTAL)" - depends on PROFILING + depends on PROFILING && !LOCKDEP help OProfile is a profiling system capable of profiling the whole system, include the kernel, kernel modules, libraries, _