aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2013-03-20 19:53:24 +0530
committerViresh Kumar <viresh.kumar@linaro.org>2013-03-20 19:53:24 +0530
commite695239d5f0a553e28a1ff5f346fcc3fafab2b2f (patch)
treeedf7a5578da80238ebb449d058a75dc6d9cef2ad
parent853725b2235c3df6f144be4b5391b99be6f9aeb4 (diff)
parentab4d6dc62b986a9c113a29e931ef165f66c72752 (diff)
downloadlinux-linaro-stable-v3.9/big-little-arm.tar.gz
Merge branch 'master-hw-bkpt-fix' into big-LITTLE-MP-master-v16v3.9/big-little-arm
-rw-r--r--arch/arm/kernel/hw_breakpoint.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
index 96093b75ab90..0ba062d7484c 100644
--- a/arch/arm/kernel/hw_breakpoint.c
+++ b/arch/arm/kernel/hw_breakpoint.c
@@ -1049,7 +1049,8 @@ static struct notifier_block __cpuinitdata dbg_cpu_pm_nb = {
static void __init pm_init(void)
{
- cpu_pm_register_notifier(&dbg_cpu_pm_nb);
+ if (has_ossr)
+ cpu_pm_register_notifier(&dbg_cpu_pm_nb);
}
#else
static inline void pm_init(void)