commit 7a6e8c9adcb7fa46a16fe930c1c81c94f2a0daef
author Christopher Ferris <cferris@google.com> Fri Jan 10 00:06:50 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 10 00:06:50 2014 +0000
tree 37c9d6f5b39f580cb8538a7070f992681d0bba8f
parent 72256db76e9810ea6b23caaabbb786f78672dc9d
parent ec7894cf5c08737f5dccacf462dd47c324309c64

am ec7894cf: am c369f199: am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."

* commit 'ec7894cf5c08737f5dccacf462dd47c324309c64':
  Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.

charger/charger.c

diff --git a/charger/charger.c b/charger/charger.c
index dda24ae..66ddeaf 100644
--- a/charger/charger.c
+++ b/charger/charger.c
@@ -67,7 +67,6 @@
 #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)
@@ -212,14 +211,10 @@
     LOGI("\n");
     LOGI("*************** LAST KMSG ***************\n");
     LOGI("\n");
-    buf = load_file(LAST_KMSG_PSTORE_PATH, &sz);
-
+    buf = load_file(LAST_KMSG_PATH, &sz);
     if (!buf || !sz) {
-        buf = load_file(LAST_KMSG_PATH, &sz);
-        if (!buf || !sz) {
-            LOGI("last_kmsg not found. Cold reset?\n");
-            goto out;
-        }
+        LOGI("last_kmsg not found. Cold reset?\n");
+        goto out;
     }
 
     len = min(sz, LAST_KMSG_MAX_SZ);