OSDN Git Service

Merge "soc: qcom: pil/ssr: fix issue with logs"
authorLinux Build Service Account <lnxbuild@localhost>
Tue, 20 Dec 2016 22:05:01 +0000 (14:05 -0800)
committerGerrit - the friendly Code Review server <code-review@localhost>
Tue, 20 Dec 2016 22:05:01 +0000 (14:05 -0800)
1  2 
drivers/soc/qcom/pil-q6v5.c
drivers/soc/qcom/subsystem_restart.c

Simple merge
@@@ -642,11 -645,11 +645,11 @@@ static void subsystem_powerup(struct su
        if (ret) {
                notify_each_subsys_device(&dev, 1, SUBSYS_POWERUP_FAILURE,
                                                                NULL);
-               panic("[%p]: Timed out waiting for error ready: %s!",
-                       current, name);
+               panic("[%s:%d]: Timed out waiting for error ready: %s!",
+                       current->comm, current->pid, name);
        }
        subsys_set_state(dev, SUBSYS_ONLINE);
 -      subsys_set_crash_status(dev, false);
 +      subsys_set_crash_status(dev, CRASH_STATUS_NO_CRASH);
  }
  
  static int __find_subsys(struct device *dev, void *data)