commit d4ffb636d8fbf851c6f8159aa5ee568177876702
author Chih-hung Hsieh <chh@google.com> Thu Jul 07 21:55:37 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 07 21:55:37 2016 +0000
tree 057115033a2eefcc787fafe752b79a678d8d2989
parent 00e3f2995f3bea5232fcdc66041ccb19b8b9d28b
parent f509370be65b728c0692f4359eae7069a26b01d7

Merge "Fix misc-macro-parentheses warnings in opengl."

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 5b7fda3..afb1255 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -46,6 +46,7 @@
 static char screenshot_path[PATH_MAX] = "";
 
 #define PSTORE_LAST_KMSG "/sys/fs/pstore/console-ramoops"
+#define ALT_PSTORE_LAST_KMSG "/sys/fs/pstore/console-ramoops-0"
 
 #define RAFT_DIR "/data/misc/raft/"
 #define TOMBSTONE_DIR "/data/tombstones"
@@ -540,6 +541,8 @@
     if (!stat(PSTORE_LAST_KMSG, &st)) {
         /* Also TODO: Make console-ramoops CAP_SYSLOG protected. */
         dump_file("LAST KMSG", PSTORE_LAST_KMSG);
+    } else if (!stat(ALT_PSTORE_LAST_KMSG, &st)) {
+        dump_file("LAST KMSG", ALT_PSTORE_LAST_KMSG);
     } else {
         /* TODO: Make last_kmsg CAP_SYSLOG protected. b/5555691 */
         dump_file("LAST KMSG", "/proc/last_kmsg");