Commit b00296fb authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 54d67ee2

drivers/crypto/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

kernel/Kconfig.instrumentation

+2 −2
Original line number Diff line number Diff line
@@ -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