Messages in this thread Patch in this message | | | Date | Wed, 28 Nov 2007 14:04:39 -0500 | From | Jeff Dike <> | Subject | [PATCH 2/4] UML - Add !UML dependencies |
| |
From: Al Viro <viro@zeniv.linux.org.uk>
That's not enough, unfortunately. If we go that way, we need to add dependencies on !UML for several options.
[ jdike - "not enough" refers to my patch which enables X86_32 and RWSEM_XCHGADD_ALGORITHM in UML's Kconfig.i386 ]
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Dike <jdike@linux.intel.com> --- drivers/crypto/Kconfig | 2 +- kernel/Kconfig.instrumentation | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
Index: linux-2.6.22/drivers/crypto/Kconfig =================================================================== --- linux-2.6.22.orig/drivers/crypto/Kconfig 2007-11-21 11:49:37.000000000 -0500 +++ linux-2.6.22/drivers/crypto/Kconfig 2007-11-26 11:54:18.000000000 -0500 @@ -12,7 +12,7 @@ if CRYPTO_HW config CRYPTO_DEV_PADLOCK tristate "Support for VIA PadLock ACE" - depends on X86_32 + depends on X86_32 && !UML select CRYPTO_ALGAPI help Some VIA processors come with an integrated crypto engine Index: linux-2.6.22/kernel/Kconfig.instrumentation =================================================================== --- linux-2.6.22.orig/kernel/Kconfig.instrumentation 2007-11-14 10:33:42.000000000 -0500 +++ linux-2.6.22/kernel/Kconfig.instrumentation 2007-11-26 11:54:18.000000000 -0500 @@ -21,7 +21,7 @@ config PROFILING config OPROFILE tristate "OProfile system profiling (EXPERIMENTAL)" depends on PROFILING - depends on ALPHA || ARM || BLACKFIN || X86_32 || IA64 || M32R || MIPS || PARISC || PPC || S390 || SUPERH || SPARC || X86_64 + depends on (ALPHA || ARM || BLACKFIN || X86_32 || IA64 || M32R || MIPS || PARISC || PPC || S390 || SUPERH || SPARC || X86_64) && !UML help OProfile is a profiling system capable of profiling the whole system, include the kernel, kernel modules, libraries, @@ -32,7 +32,7 @@ config OPROFILE config KPROBES bool "Kprobes" depends on KALLSYMS && MODULES - depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32 + depends on (X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32) && !UML help Kprobes allows you to trap at almost any kernel address and execute a callback function. register_kprobe() establishes - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |