提交: 568d0eebe0724f63c9829e7067e913e03ac49f99 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• 修訂: 568d0eebe0724f63c9829e7067e913e03ac49f99 (tree)
• 時間: 2016-08-16 05:34:08
• 作者: Jaap Jan Meijer <jjmeijer88@gmai...>
• Commiter: Jaap Jan Meijer

Log Message

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

Conflicts:
init/init.cpp

Change Summary

• modified: init/devices.cpp
• modified: init/init.cpp

差異

--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -894,13 +894,12 @@ static int load_module_by_device_modalias(const char *id)
                         /* cannot load module. try another one since
                          * there may be another match.
                          */
-                        INFO("cannot load module %s due to uevents\n",
-                             alias->name);
+                        NOTICE("failed to load %s for modalias %s\n",
+                             alias->name, id);
                     } else {
                         /* loading was successful */
                         INFO("loaded module %s due to uevents\n", alias->name);
                         ret = 0;
-                        break;
                     }
                 }
             }

--- a/init/init.cpp
+++ b/init/init.cpp
@@ -640,10 +640,10 @@ static int wait_for_coldboot_done_action(int nargs, char **args) {
     Timer t;
 
     NOTICE("Waiting for %s...\n", COLDBOOT_DONE);
-    // Any longer than 1s is an unreasonable length of time to delay booting.
+    // Any longer than 10s is an unreasonable length of time to delay booting.
     // If you're hitting this timeout, check that you didn't make your
     // sepolicy regular expressions too expensive (http://b/19899875).
-    if (wait_for_file(COLDBOOT_DONE, 5)) {
+    if (wait_for_file(COLDBOOT_DONE, 10)) {
         ERROR("Timed out waiting for %s\n", COLDBOOT_DONE);
     }