| commit | 630d803dee8ac55c097772045704f59fb8bf4f7e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Nov 20 16:10:51 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Nov 20 16:10:51 2018 +0000 |
| tree | 03319e6056c258e29ede64f66014d5be33f4d0bc | |
| parent | eb1213f1707bb6911fd4116d51e17f331abfaa90 [diff] | |
| parent | b3418a22555c53c47d2366bab91f6af579504269 [diff] |
Merge "llkd: do not crash kernel if llkd stops running"
diff --git a/llkd/libllkd.cpp b/llkd/libllkd.cpp index 0827470..427dace 100644 --- a/llkd/libllkd.cpp +++ b/llkd/libllkd.cpp
@@ -555,7 +555,9 @@ } void llkAlarmHandler(int) { - llkPanicKernel(false, ::getpid(), "alarm"); + LOG(FATAL) << "alarm"; + // NOTREACHED + llkPanicKernel(true, ::getpid(), "alarm"); } milliseconds GetUintProperty(const std::string& key, milliseconds def) {