Merge branch 'dev' into major

Conflicts:
	erts/aclocal.m4
	erts/include/internal/ethread_header_config.h.in

15 files changed, 25 insertions, 24 deletions

diff --git a/erts/aclocal.m4 b/erts/aclocal.m4
index 3ebea66d30..5daaa0ae5b 100644
--- a/erts/aclocal.m4
+++ b/erts/aclocal.m4
@@ -1363,7 +1363,8 @@ case "$GCC-$host_cpu" in
     ;;
 esac
 
-
+test $enable_ethread_pre_pentium4_compatibility = yes &&
+  AC_DEFINE(ETHR_PRE_PENTIUM4_COMPAT, 1, [Define if you want compatibility with x86 processors before pentium4.])
 
 AC_DEFINE(ETHR_HAVE_ETHREAD_DEFINES, 1, \
 [Define if you have all ethread defines])
@@ -1645,11 +1646,11 @@ dnl Freely inspired by AC_TRY_LINK. (Maybe better to create a
 dnl AC_LANG_JAVA instead...)
 AC_DEFUN(ERL_TRY_LINK_JAVA,
 [java_link='$JAVAC conftest.java 1>&AC_FD_CC'
-changequote(�, �)dnl
+changequote(, )dnl
 cat > conftest.java <<EOF
-�$1�
+$1
 class conftest { public static void main(String[] args) {
-   �$2�
+   $2
    ; return; }}
 EOF
 changequote([, ])dnl
diff --git a/erts/doc/src/alt_dist.xml b/erts/doc/src/alt_dist.xml
index 36d83a685b..c30e04fce7 100644
--- a/erts/doc/src/alt_dist.xml
+++ b/erts/doc/src/alt_dist.xml
@@ -377,7 +377,7 @@
 ( 1) typedef enum { 
 ( 2)     portTypeUnknown,      /* An uninitialized port */
 ( 3)     portTypeListener,     /* A listening port/socket */
-( 4)     portTypeAcceptor,     /* An intermidiate stage when accepting 
+( 4)     portTypeAcceptor,     /* An intermediate stage when accepting
 ( 5)                              on a listen port */
 ( 6)     portTypeConnector,    /* An intermediate stage when connecting */
 ( 7)     portTypeCommand,      /* A connected open port in command mode */
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml
index 382e446dce..980fc0cc39 100644
--- a/erts/doc/src/erl_nif.xml
+++ b/erts/doc/src/erl_nif.xml
@@ -216,14 +216,14 @@ ok
       <p/>
       <code type="none">
     ERL_NIF_TERM term;
-    MyStruct* ptr = enif_alloc_resource(my_resource_type, sizeof(MyStruct));
+    MyStruct* obj = enif_alloc_resource(my_resource_type, sizeof(MyStruct));
 
     /* initialize struct ... */
 
-    term = enif_make_resource(env, ptr);
+    term = enif_make_resource(env, obj);
 
     if (keep_a_reference_of_our_own) {
-        /* store 'ptr' in static variable, private data or other resource object */
+        /* store 'obj' in static variable, private data or other resource object */
     }
     else {
         enif_release_resource(obj);
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 7fba12aae0..61a1c4a0a0 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -5979,7 +5979,7 @@ true</pre>
           </item>
           <tag><c>wordsize</c></tag>
           <item>
-            <p>Same as <c>{wordsize, internal}</c></p>
+            <p>Same as <c>{wordsize, internal}.</c></p>
           </item>
           <tag><c>{wordsize, internal}</c></tag>
           <item>
@@ -5988,7 +5988,7 @@ true</pre>
               and on a pure 64-bit architecture 8 is returned. On a
               halfword 64-bit emulator, 4 is returned, as the Erlang
               terms are stored using a virtual wordsize of half the
-              systems wordsize.</p>
+              system's wordsize.</p>
           </item>
           <tag><c>{wordsize, external}</c></tag>
           <item>
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 3733fb2db9..3e9e6a35f2 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -4534,7 +4534,7 @@
 	    The race occurred when a process removed a table during
 	    termination simultaneously as another process removed the
 	    same table via <c>ets:delete/1</c> and a third process
-	    created a table that accidentaly got the same internal
+	    created a table that accidentally got the same internal
 	    table index as the table being removed.</p>
           <p>
 	    Own Id: OTP-7349</p>
diff --git a/erts/emulator/beam/erl_bif_trace.c b/erts/emulator/beam/erl_bif_trace.c
index 0509e51a6f..fbd8757751 100644
--- a/erts/emulator/beam/erl_bif_trace.c
+++ b/erts/emulator/beam/erl_bif_trace.c
@@ -679,7 +679,7 @@ trace_3(Process* p, Eterm pid_spec, Eterm how, Eterm list)
 		    } else if (tracer != NIL) {
 			tracee_port->tracer_proc = tracer;
 		    }
-		    /* matches are not counted for ports since it would violate compability */	
+		    /* matches are not counted for ports since it would violate compatibility */
 		    /* This could be a reason to modify this function or make a new one. */
 		}
 	    }
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index ebc4469a23..743c01d935 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -7012,7 +7012,7 @@ static int sctp_fill_opts(inet_descriptor* desc, char* buf, int buflen,
 	default:
 	    RETURN_ERROR(spec, -EINVAL); /* No more valid options */
 	}
-	/* If we get here one result has been succesfully loaded */
+	/* If we get here one result has been successfully loaded */
 	length ++;
     }
     if (buflen != 0) RETURN_ERROR(spec, -EINVAL); /* Optparam mismatch */
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index 81f1c95020..9bd64f5908 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -405,7 +405,7 @@ woke_up(ErtsPollSet ps)
 static ERTS_INLINE void
 wake_poller(ErtsPollSet ps, int interrupted)
 {
-    int wake;
+    int wake = 0;
 #ifdef ERTS_SMP
     erts_aint32_t wakeup_state;
     if (!interrupted)
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index 94c39dc2c5..3e151c26d5 100644
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -2772,7 +2772,7 @@ ready_output(ErlDrvData drv_data, ErlDrvEvent ready_event)
     DEBUGF(("ready_output(%d, 0x%x)\n", drv_data, ready_event));
     set_busy_port(dp->port_num, 0);
     if (!(dp->outbuf)) {
-	/* Happens because event sometimes get signalled during a succesful
+	/* Happens because event sometimes get signalled during a successful
 	   write... */
 	return;
     }
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index 4bebae51cc..e4af5c00a6 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -173,7 +173,7 @@ bulk_sendsend(Terms, BinSize) ->
     Ratio = if MonitorCount2 == 0 -> MonitorCount1 / 1.0;
                true               -> MonitorCount1 / MonitorCount2
             end,
-    %% A somewhat arbitrary ratio, but hopefully one that will accomodate
+    %% A somewhat arbitrary ratio, but hopefully one that will accommodate
     %% a wide range of CPU speeds.
     true = (Ratio > 8.0),
     {comment,
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index f6cf01ce16..a77ea4f3be 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -1590,7 +1590,7 @@ otp_6879(Config) when is_list(Config) ->
 				      end
 			end,
 			Procs),
-    %% Also try it when input exeeds default buffer (256 bytes)
+    %% Also try it when input exceeds default buffer (256 bytes)
     ?line Data = lists:seq(1, 1000),
     ?line case open_port({spawn, Drv}, []) of
 	      Port when is_port(Port) ->
diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl
index ccfa7978c8..4a72bae105 100644
--- a/erts/preloaded/src/erl_prim_loader.erl
+++ b/erts/preloaded/src/erl_prim_loader.erl
@@ -396,7 +396,7 @@ handle_timeout(State = #state{loader = inet}, Parent) ->
     inet_timeout_handler(State, Parent).
 
 %%% --------------------------------------------------------
-%%% Functions which handles efile as prim_loader (default).
+%%% Functions which handle efile as prim_loader (default).
 %%% --------------------------------------------------------
 
 %%% Reading many files in parallel is an optimization. 
@@ -523,7 +523,7 @@ efile_timeout_handler(#state{n_timeouts = N} = State, _Parent) ->
     end.
 
 %%% --------------------------------------------------------
-%%% Functions which handles inet prim_loader
+%%% Functions which handle inet prim_loader
 %%% --------------------------------------------------------
 
 %%
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index e52c813029..c9c434dea0 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -345,7 +345,7 @@ notify(Pids) ->
     lists:foreach(fun(Pid) -> Pid ! {init,started} end, Pids).
 
 %% Garbage collect all info about initially loaded modules.
-%% This information is temporary stored until the code_server
+%% This information is temporarily stored until the code_server
 %% is started.
 %% We force the garbage collection as the init process holds
 %% this information during the initialisation of the system and
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index b18a57bfef..30b7a5246a 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -375,7 +375,7 @@ read(#file_descriptor{module = ?MODULE, data = {Port, _}}, Size)
 		    {ok, Data};
 		{error, enomem} ->
 		    %% Garbage collecting here might help if
-		    %% the current processes has some old binaries left.
+		    %% the current processes have some old binaries left.
 		    erlang:garbage_collect(),
 		    case drv_command(Port, <<?FILE_READ, Size:64>>) of
 			{ok, {0, _Data}} when Size =/= 0 ->
@@ -825,7 +825,7 @@ list_dir_int(Port, Dir) ->
 
 
 %% Opens a driver port and converts any problems into {error, emfile}.
-%% Returns {ok, Port} when succesful.
+%% Returns {ok, Port} when successful.
 
 drv_open(Driver, Portopts) ->
     try erlang:open_port({spawn, Driver}, Portopts) of
@@ -945,7 +945,7 @@ append([I | Is], R) when is_list(R) -> append(Is, [I | R]);
 append([], R) -> R.
 
 
-%% Converts a list of mode atoms into an mode word for the driver.
+%% Converts a list of mode atoms into a mode word for the driver.
 %% Returns {Mode, Portopts, Setopts} where Portopts is a list of 
 %% options for erlang:open_port/2 and Setopts is a list of 
 %% setopt commands to send to the port, or error Reason upon failure.
diff --git a/erts/preloaded/src/prim_zip.erl b/erts/preloaded/src/prim_zip.erl
index 6a9856fdad..5dc8e3ca13 100644
--- a/erts/preloaded/src/prim_zip.erl
+++ b/erts/preloaded/src/prim_zip.erl
@@ -21,7 +21,7 @@
 
 -module(prim_zip).
 
-%% unzipping piecemal
+%% unzipping piecemeal
 -export([
 	 open/1,
 	 open/3,