diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-13 02:18:58 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-13 02:18:57 -0700 |
| commit | 0adf9d405048e40443296c02afacc44d0ec600c9 (patch) | |
| tree | fe2abf08d521876ef30ca90ceca2a77d9e4827fd /kernel | |
| parent | 4a4051e573b6896ba047fd2a1f6163c6165f8fb7 (diff) | |
| parent | ab2a5c9e22ef24d3f398d157cb11f41aad7b5c34 (diff) | |
Merge "Merge branch 'android-4.4@8e53f7c' into branch 'msm-4.4'"
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/watchdog.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 1de2ef8ec926..f527d8e65d69 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -123,9 +123,7 @@ static unsigned long soft_lockup_nmi_warn; #ifdef CONFIG_HARDLOCKUP_DETECTOR unsigned int __read_mostly hardlockup_panic = CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE; -#ifdef CONFIG_HARDLOCKUP_DETECTOR_NMI static unsigned long __maybe_unused hardlockup_allcpu_dumped; -#endif /* * We may not want to enable hard lockup detection by default in all cases, * for example when running the kernel as a guest on a hypervisor. In these |