aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Yinhe <[email protected]>2014-10-20 09:33:19 +0200
committerBruce Yinhe <[email protected]>2014-10-20 09:33:19 +0200
commit66d3eb4d6757e49c5cf1ddb7ca1809208eafe146 (patch)
treeefbef3f18ef9caedff72bd6b35caf154c9b64ef1
parent8c4f92263793b5900490fdd4ad2673fd06398381 (diff)
parent98baee7ecca0ad0794560d455a1bb0e5f9c5cb40 (diff)
downloadotp-66d3eb4d6757e49c5cf1ddb7ca1809208eafe146.tar.gz
otp-66d3eb4d6757e49c5cf1ddb7ca1809208eafe146.tar.bz2
otp-66d3eb4d6757e49c5cf1ddb7ca1809208eafe146.zip
Merge branch 'maint'
-rw-r--r--lib/kernel/src/application_master.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/kernel/src/application_master.erl b/lib/kernel/src/application_master.erl
index bc15b5a7de..7cdbe31ab2 100644
--- a/lib/kernel/src/application_master.erl
+++ b/lib/kernel/src/application_master.erl
@@ -103,9 +103,9 @@ call(AppMaster, Req) ->
%%% The reason for not using the logical structrure is that
%%% the application start function is synchronous, and
%%% that the AM is GL. This means that if AM executed the start
-%%% function, and this function uses spawn_request/1
-%%% or io, deadlock would occur. Therefore, this function is
-%%% executed by the process X. Also, AM needs three loops;
+%%% function, and this function uses io, deadlock would occur.
+%%% Therefore, this function is executed by the process X.
+%%% Also, AM needs three loops;
%%% init_loop (waiting for the start function to return)
%%% main_loop
%%% terminate_loop (waiting for the process to die)