projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.10.55' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
arm
/
kernel
/
hw_breakpoint.c
diff --git
a/arch/arm/kernel/hw_breakpoint.c
b/arch/arm/kernel/hw_breakpoint.c
index 1fd749ee4a1bb96c1740f4a131fde1d3cd53bfb0..1b803117ed91c212a6f4077d6c87b58c0e219f44 100644
(file)
--- a/
arch/arm/kernel/hw_breakpoint.c
+++ b/
arch/arm/kernel/hw_breakpoint.c
@@
-1049,7
+1049,8
@@
static struct notifier_block 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)