commit 88d040a32feac727a7e11658198c32d9cc563d8e
author Nick Kralevich <nnk@google.com> Thu Jan 02 21:06:32 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 02 21:06:32 2014 +0000
tree 922190e1101d1bb787c7aaeeda845d245184a592
parent 764daa33c06b5fd699bf0c8162b18dd39b00795a
parent 3df76c0c738e0205cf287dbdf6ebe3b75d765b87

am 3df76c0c: am 6bec36ec: am 5b8abdf6: Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls."

* commit '3df76c0c738e0205cf287dbdf6ebe3b75d765b87':
  Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.

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