From 6e0863d2f2f253f079f78b2b25ddcc1f9341c3ef Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 1 Dec 2007 12:16:29 -0800 Subject: [PATCH] --- yaml --- r: 74429 b: refs/heads/master c: b00296fb781acfafa93687000cdef72b8922bb40 h: refs/heads/master i: 74427: 86581dc96246558d8057dacd1a0e0648ef1825a6 v: v3 --- [refs] | 2 +- trunk/drivers/crypto/Kconfig | 2 +- trunk/kernel/Kconfig.instrumentation | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2af4caa58a69..2514dcd19a02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54d67ee22c1ed12ff595defdf89e3d07b430497d +refs/heads/master: b00296fb781acfafa93687000cdef72b8922bb40 diff --git a/trunk/drivers/crypto/Kconfig b/trunk/drivers/crypto/Kconfig index 5fd6688a444a..ddd3a259cea1 100644 --- a/trunk/drivers/crypto/Kconfig +++ b/trunk/drivers/crypto/Kconfig @@ -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 diff --git a/trunk/kernel/Kconfig.instrumentation b/trunk/kernel/Kconfig.instrumentation index f5f2c769d95e..2ea1e347df45 100644 --- a/trunk/kernel/Kconfig.instrumentation +++ b/trunk/kernel/Kconfig.instrumentation @@ -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