Commit:     7d2284b09fd967b5cad6f03c6d4a5c064f37b855
Parent:     38ad9aebe70dc72df08851bbd1620d89329129ba
Author:     Mathieu Desnoyers <[EMAIL PROTECTED]>
AuthorDate: Tue Jan 15 12:42:02 2008 -0500
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Jan 15 12:32:30 2008 -0800

    Fix Blackfin HARDWARE_PM support
    This patch restores the blackfin Hardware Performance Monitor Profiling
    support that was killed by the combining of instrumentation menus in
    commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9.
    Since there seems to be no good reason to behave differently from other
    architectures, it now automatically selects the hardware performance
    counters whenever the profiling is activated.
    mach-common/irqpanic.c: pm_overflow calls pm_overflow_handler which is
    in oprofile/op_model_bf533.c.  I doubt that setting HARDWARE_PM as "m"
    will work at all, since the pm_overflow_handler should be in the core
    kernel image because it is called by irqpanic.c.
    Therefore, I change HARDWARE_PM from a tristate to a bool.
    The whole arch/$(ARCH)/oprofile/ is built depending on CONFIG_OPROFILE. 
    part of the HARDWARE_PM support files sits in this directory, it makes 
sense to
    also depend on OPROFILE, not only PROFILING. Since OPROFILE already depends 
    PROFILING, it is correct to only depend on OPROFILE only.
    Thanks to Adrian Bunk for finding this bug and providing an initial
    Signed-off-by: Mathieu Desnoyers <[EMAIL PROTECTED]>
    CC: Adrian Bunk <[EMAIL PROTECTED]>
    CC: Randy Dunlap <[EMAIL PROTECTED]>
    Acked-by: Robin Getz <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 arch/blackfin/Kconfig |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 2a3a7ea..25232ba 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -65,6 +65,10 @@ config GENERIC_CALIBRATE_DELAY
        default y
+       def_bool y
+       depends on OPROFILE
 source "init/Kconfig"
 source "kernel/Kconfig.preempt"
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

Reply via email to