commit 090928b11b02d4a724f90eca65346918c44b144c
author Elliott Hughes <enh@google.com> Thu Jan 02 23:33:33 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 02 23:33:33 2014 +0000
tree 64bf1bec88b95ee116188e054a5447bb95d60ba9
parent 3df76c0c738e0205cf287dbdf6ebe3b75d765b87
parent a345b25371aa49ebaa4f3b36bb664ba4cf600e60

am a345b253: am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily."

* commit 'a345b25371aa49ebaa4f3b36bb664ba4cf600e60':
  Switch ARM back to libcorkscrew temporarily.

charger/charger.c

diff --git a/charger/charger.c b/charger/charger.c
index 66ddeaf..dda24ae 100644
--- a/charger/charger.c
+++ b/charger/charger.c
@@ -67,6 +67,7 @@
 #define BATTERY_FULL_THRESH     95
 
 #define LAST_KMSG_PATH          "/proc/last_kmsg"
+#define LAST_KMSG_PSTORE_PATH   "/sys/fs/pstore/console-ramoops"
 #define LAST_KMSG_MAX_SZ        (32 * 1024)
 
 #define LOGE(x...) do { KLOG_ERROR("charger", x); } while (0)
@@ -211,10 +212,14 @@
     LOGI("\n");
     LOGI("*************** LAST KMSG ***************\n");
     LOGI("\n");
-    buf = load_file(LAST_KMSG_PATH, &sz);
+    buf = load_file(LAST_KMSG_PSTORE_PATH, &sz);
+
     if (!buf || !sz) {
-        LOGI("last_kmsg not found. Cold reset?\n");
-        goto out;
+        buf = load_file(LAST_KMSG_PATH, &sz);
+        if (!buf || !sz) {
+            LOGI("last_kmsg not found. Cold reset?\n");
+            goto out;
+        }
     }
 
     len = min(sz, LAST_KMSG_MAX_SZ);