diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-13 05:43:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-13 05:43:53 -0700 |
| commit | 9ed8bfe3f2b22fedbd9f7eaa7ccb060851a3334e (patch) | |
| tree | e8795abd658511ebd52279c168f20dbf797d8c18 /kernel | |
| parent | d58d587e95f6d19f903a4e4c0cbd26cfcadb1f6c (diff) | |
| parent | c568eb7aca15625b4afdd922350b9b352ea78c2f (diff) | |
Merge "Merge branch 'tmp-bab1564' into msm-4.4"
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/Kconfig | 1 | ||||
| -rw-r--r-- | kernel/watchdog.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 84c480946fb2..6d6f63be1f9b 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -1,6 +1,7 @@ config SUSPEND bool "Suspend to RAM and standby" depends on ARCH_SUSPEND_POSSIBLE + select RTC_LIB default y ---help--- Allow the system to enter sleep states in which main memory is diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 9472691c1eb0..029da92fb712 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -121,7 +121,7 @@ static unsigned long soft_lockup_nmi_warn; unsigned int __read_mostly hardlockup_panic = CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE; #ifdef CONFIG_HARDLOCKUP_DETECTOR_NMI -static unsigned long hardlockup_allcpu_dumped; +static unsigned long __maybe_unused hardlockup_allcpu_dumped; #endif /* * We may not want to enable hard lockup detection by default in all cases, |