1 files changed, 11 insertions, 27 deletions
diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl
index d3db8eb80a..5f83713cf7 100644
--- a/lib/kernel/src/rpc.erl
+++ b/lib/kernel/src/rpc.erl
@@ -52,10 +52,6 @@
 	 parallel_eval/1,
 	 pmap/3, pinfo/1, pinfo/2]).
 
-%% Deprecated calls.
--deprecated([{safe_multi_server_call,2},{safe_multi_server_call,3}]).
--export([safe_multi_server_call/2,safe_multi_server_call/3]).
-
 %% gen_server exports
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
 	 terminate/2, code_change/3]).
@@ -357,8 +353,12 @@ do_call(Node, Request, Timeout) ->
 rpc_check_t({'EXIT', {timeout,_}}) -> {badrpc, timeout};
 rpc_check_t(X) -> rpc_check(X).
 	    
-rpc_check({'EXIT', {{nodedown,_},_}}) -> {badrpc, nodedown};
-rpc_check({'EXIT', X}) -> exit(X);
+rpc_check({'EXIT', {{nodedown,_},_}}) ->
+    {badrpc, nodedown};
+rpc_check({'EXIT', _}=Exit) ->
+    %% Should only happen if the rex process on the other node
+    %% died.
+    {badrpc, Exit};
 rpc_check(X) -> X.
 
 
@@ -587,27 +587,6 @@ multi_server_call(Nodes, Name, Msg)
     Monitors = send_nodes(Nodes, Name, Msg, []),
     rec_nodes(Name, Monitors).
 
-%% Deprecated functions. Were only needed when communicating with R6 nodes.
-
--spec safe_multi_server_call(Name, Msg) -> {Replies, BadNodes} when
-      Name :: atom(),
-      Msg :: term(),
-      Replies :: [Reply :: term()],
-      BadNodes :: [node()].
-
-safe_multi_server_call(Name, Msg) ->
-    multi_server_call(Name, Msg).
-
--spec safe_multi_server_call(Nodes, Name, Msg) -> {Replies, BadNodes} when
-      Nodes :: [node()],
-      Name :: atom(),
-      Msg :: term(),
-      Replies :: [Reply :: term()],
-      BadNodes :: [node()].
-
-safe_multi_server_call(Nodes, Name, Msg) ->
-    multi_server_call(Nodes, Name, Msg).
-
 
 rec_nodes(Name, Nodes) -> 
     rec_nodes(Name, Nodes, [], []).
@@ -748,6 +727,11 @@ pinfo(Pid) ->
 -spec pinfo(Pid, Item) -> {Item, Info} | undefined | [] when
       Pid :: pid(),
       Item :: atom(),
+      Info :: term();
+           (Pid, ItemList) -> [{Item, Info}] | undefined | [] when
+      Pid :: pid(),
+      Item :: atom(),
+      ItemList :: [Item],
       Info :: term().
 
 pinfo(Pid, Item) when node(Pid) =:= node() ->