tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

uml: add !UML dependencies

The previous commit ("uml: keep UML Kconfig in sync with x86") is not
enough, unfortunately. If we go that way, we need to add dependencies
on !UML for several options.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Al Viro and committed by
Linus Torvalds b00296fb 54d67ee2

+3 -3
+1 -1
drivers/crypto/Kconfig
··· 12 12 13 13 config CRYPTO_DEV_PADLOCK 14 14 tristate "Support for VIA PadLock ACE" 15 - depends on X86_32 15 + depends on X86_32 && !UML 16 16 select CRYPTO_ALGAPI 17 17 help 18 18 Some VIA processors come with an integrated crypto engine
+2 -2
kernel/Kconfig.instrumentation
··· 21 21 config OPROFILE 22 22 tristate "OProfile system profiling (EXPERIMENTAL)" 23 23 depends on PROFILING 24 - depends on ALPHA || ARM || BLACKFIN || X86_32 || IA64 || M32R || MIPS || PARISC || PPC || S390 || SUPERH || SPARC || X86_64 24 + depends on (ALPHA || ARM || BLACKFIN || X86_32 || IA64 || M32R || MIPS || PARISC || PPC || S390 || SUPERH || SPARC || X86_64) && !UML 25 25 help 26 26 OProfile is a profiling system capable of profiling the 27 27 whole system, include the kernel, kernel modules, libraries, ··· 32 32 config KPROBES 33 33 bool "Kprobes" 34 34 depends on KALLSYMS && MODULES 35 - depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32 35 + depends on (X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32) && !UML 36 36 help 37 37 Kprobes allows you to trap at almost any kernel address and 38 38 execute a callback function. register_kprobe() establishes