commit 7dee721eb3387fff695e5b5a3480428bccb3cf70
author Elliott Hughes <enh@google.com> Wed Jan 15 00:57:41 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 15 00:57:41 2014 +0000
tree e22e2c237a7e6b1edc0c4b7f803d817017798ed3
parent b6e70fce5365c596a7b0b22cd3ba75c5d7ef6430
parent 42e82f80fef7b1f13c9c3ab184cea065f4f4edbc

am 42e82f80: am 4a8996fb: am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace."

* commit '42e82f80fef7b1f13c9c3ab184cea065f4f4edbc':
  Copy the bionic -fstack-protector hack into libbacktrace.

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);