6 files changed, 45 insertions, 21 deletions
diff --git a/lib/kernel/src/disk_log.erl b/lib/kernel/src/disk_log.erl
index 5b1efcd395..1513fdaec0 100644
--- a/lib/kernel/src/disk_log.erl
+++ b/lib/kernel/src/disk_log.erl
@@ -44,6 +44,8 @@
 %% To be used for debugging only:
 -export([pid2name/1]).
 
+-export_type([continuation/0]).
+
 -type dlog_state_error() :: 'ok' | {'error', term()}.
 
 -record(state, {queue = [],
diff --git a/lib/kernel/src/erl_ddll.erl b/lib/kernel/src/erl_ddll.erl
index f967fcc2ef..e03d280cd8 100644
--- a/lib/kernel/src/erl_ddll.erl
+++ b/lib/kernel/src/erl_ddll.erl
@@ -54,9 +54,7 @@ info(_, _) ->
     erlang:nif_error(undef).
 
 -spec format_error_int(ErrSpec) -> string() when
-      ErrSpec :: inconsisten | linked_in_driver | permanent
-               | not_loaded | not_loaded_by_this_process | not_pending
-               | already_loaded | unloading.
+      ErrSpec :: term().
 
 format_error_int(_) ->
     erlang:nif_error(undef).
diff --git a/lib/kernel/src/pg2.erl b/lib/kernel/src/pg2.erl
index 0d5838716e..1ff10eb303 100644
--- a/lib/kernel/src/pg2.erl
+++ b/lib/kernel/src/pg2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -159,7 +159,7 @@ get_closest_pid(Name) ->
 
 -record(state, {}).
 
--opaque state() :: #state{}.
+-type state() :: #state{}.
 
 -spec init(Arg :: []) -> {'ok', state()}.
 
diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl
index 0b1fc6e939..7c965ca384 100644
--- a/lib/kernel/src/rpc.erl
+++ b/lib/kernel/src/rpc.erl
@@ -62,6 +62,8 @@
 %% Internals
 -export([proxy_user_flush/0]).
 
+-export_type([key/0]).
+
 %%------------------------------------------------------------------------
 
 -type state() :: gb_tree().
diff --git a/lib/kernel/src/wrap_log_reader.erl b/lib/kernel/src/wrap_log_reader.erl
index c41e0091e4..689269fc28 100644
--- a/lib/kernel/src/wrap_log_reader.erl
+++ b/lib/kernel/src/wrap_log_reader.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -30,6 +30,8 @@
 
 -export([open/1, open/2, chunk/1, chunk/2, close/1]).
 
+-export_type([continuation/0]).
+
 -include("disk_log.hrl").
 
 -record(wrap_reader, 
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index bcc2f0b840..2a886b2efc 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -31,22 +31,24 @@
    [basic/1,
     api_open_close/1,api_listen/1,api_connect_init/1,api_opts/1,
     xfer_min/1,xfer_active/1,def_sndrcvinfo/1,implicit_inet6/1,
-    basic_stream/1, xfer_stream_min/1, peeloff/1, buffers/1,
     open_multihoming_ipv4_socket/1,
     open_unihoming_ipv6_socket/1,
     open_multihoming_ipv6_socket/1,
-    open_multihoming_ipv4_and_ipv6_socket/1]).
+    open_multihoming_ipv4_and_ipv6_socket/1,
+    basic_stream/1, xfer_stream_min/1, peeloff_active_once/1,
+    peeloff_active_true/1, buffers/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [basic, api_open_close, api_listen, api_connect_init,
      api_opts, xfer_min, xfer_active, def_sndrcvinfo, implicit_inet6,
-     basic_stream, xfer_stream_min, peeloff, buffers,
      open_multihoming_ipv4_socket,
      open_unihoming_ipv6_socket,
      open_multihoming_ipv6_socket,
-     open_multihoming_ipv4_and_ipv6_socket].
+     open_multihoming_ipv4_and_ipv6_socket,
+     basic_stream, xfer_stream_min, peeloff_active_once,
+     peeloff_active_true, buffers].
 
 groups() -> 
     [].
@@ -923,23 +925,34 @@ do_from_other_process(Fun) ->
     end.
 
 
+peeloff_active_once(doc) ->
+    "Peel off an SCTP stream socket ({active,once})";
+peeloff_active_once(suite) ->
+    [];
+
+peeloff_active_once(Config) ->
+    peeloff(Config, [{active,once}]).
 
-peeloff(doc) ->
-    "Peel off an SCTP stream socket";
-peeloff(suite) ->
+peeloff_active_true(doc) ->
+    "Peel off an SCTP stream socket ({active,true})";
+peeloff_active_true(suite) ->
     [];
-peeloff(Config) when is_list(Config) ->
+
+peeloff_active_true(Config) ->
+    peeloff(Config, [{active,true}]).
+
+peeloff(Config, SockOpts) when is_list(Config) ->
     ?line Addr = {127,0,0,1},
     ?line Stream = 0,
     ?line Timeout = 333,
-    ?line S1 = socket_open([{ifaddr,Addr}], Timeout),
+    ?line S1 = socket_open([{ifaddr,Addr}|SockOpts], Timeout),
     ?line ?LOGVAR(S1),
     ?line P1 = socket_call(S1, get_port),
     ?line ?LOGVAR(P1),
     ?line Socket1 = socket_call(S1, get_socket),
     ?line ?LOGVAR(Socket1),
     ?line socket_call(S1, {listen,true}),
-    ?line S2 = socket_open([{ifaddr,Addr}], Timeout),
+    ?line S2 = socket_open([{ifaddr,Addr}|SockOpts], Timeout),
     ?line ?LOGVAR(S2),
     ?line P2 = socket_call(S2, get_port),
     ?line ?LOGVAR(P2),
@@ -983,7 +996,7 @@ peeloff(Config) when is_list(Config) ->
 		socket_bailout([S1,S2])
 	end,
     %%
-    ?line S3 = socket_peeloff(Socket1, S1Ai, Timeout),
+    ?line S3 = socket_peeloff(Socket1, S1Ai, SockOpts, Timeout),
     ?line ?LOGVAR(S3),
     ?line P3_X = socket_call(S3, get_port),
     ?line ?LOGVAR(P3_X),
@@ -1302,8 +1315,15 @@ recv_comm_up_eventually(S) ->
 %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% socket gen_server ultra light
 
-socket_open(SocketOpts, Timeout) ->
-    Opts = [{type,seqpacket},{active,once},binary|SocketOpts],
+socket_open(SockOpts0, Timeout) ->
+    SockOpts =
+	case lists:keyfind(active,1,SockOpts0) of
+	    false ->
+		[{active,once}|SockOpts0];
+	    _ ->
+		SockOpts0
+	end,
+    Opts = [{type,seqpacket},binary|SockOpts],
     Starter =
 	fun () ->
 		{ok,Socket} =
@@ -1312,8 +1332,8 @@ socket_open(SocketOpts, Timeout) ->
 	end,
     s_start(Starter, Timeout).
 
-socket_peeloff(Socket, AssocId, Timeout) ->
-    Opts = [{active,once},binary],
+socket_peeloff(Socket, AssocId, SocketOpts, Timeout) ->
+    Opts = [binary|SocketOpts],
     Starter =
 	fun () ->
 		{ok,NewSocket} =