Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=00a5825332769706eb2e276c101dd20269a53992
Commit:     00a5825332769706eb2e276c101dd20269a53992
Parent:     7e1fb765c613298d861f80fa18af26df87a4ec19
Author:     Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Thu Dec 6 16:53:19 2007 +0000
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Dec 6 09:37:03 2007 -0800

    Fix oprofile configuration breakage
    
    The cleanup 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9 broke the oprofile
    configuration for MIPS by allowing oprofile support to be built for
    kernel models where oprofile doesn't have a chance in hell to work.
    
    Just a dependecy list on a number of architectures is - surprise - broken
    and should as per past discussions probably in most considered to be
    broken in most cases.  So I introduce a dependency for the oprofile
    configuration on ARCH_SUPPORTS_OPROFILE.
    
    Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 arch/mips/Kconfig              |    4 ++++
 kernel/Kconfig.instrumentation |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 455bd1f..c6fc405 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -714,6 +714,10 @@ config ARCH_HAS_ILOG2_U64
        bool
        default n
 
+config ARCH_SUPPORTS_OPROFILE
+       bool
+       default y if !MIPS_MT_SMTC
+
 config GENERIC_FIND_NEXT_BIT
        bool
        default y
diff --git a/kernel/Kconfig.instrumentation b/kernel/Kconfig.instrumentation
index 2ea1e34..12a9f74 100644
--- a/kernel/Kconfig.instrumentation
+++ b/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) && !UML
+       depends on (ARCH_SUPPORTS_OPROFILE || ALPHA || ARM || BLACKFIN || 
X86_32 || IA64 || M32R || 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,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to