[MIPS] Alchemy: fix off by two error in __fixup_bigphys_addr()

[linux-2.6-omap-h63xx.git] / kernel / Kconfig.instrumentation

diff --git a/kernel/Kconfig.instrumentation b/kernel/Kconfig.instrumentation
index f5f2c769d95e76bfe0c0b5ca702e40f44083a366..468f47ad750395dcf2685b3b112dbcfb9ae43e7e 100644 (file)
--- a/kernel/Kconfig.instrumentation
+++ b/kernel/Kconfig.instrumentation
@@ -20,8 +20,8 @@ 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 PROFILING && !UML
+       depends on ARCH_SUPPORTS_OPROFILE || ALPHA || ARM || BLACKFIN || IA64 || M32R || PARISC || PPC || S390 || SUPERH || SPARC
        help
          OProfile is a profiling system capable of profiling the
          whole system, include the kernel, kernel modules, libraries,
@@ -31,7 +31,7 @@ config OPROFILE
 
 config KPROBES
        bool "Kprobes"
-       depends on KALLSYMS && MODULES
+       depends on KALLSYMS && MODULES && !UML
        depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32
        help
          Kprobes allows you to trap at almost any kernel address and