From 35d4270f1e3d233bd3e0b2b001480c7bf32ff09d Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Fri, 1 Oct 2010 18:35:51 +0200
Subject: Teach read_topology not to crash on W2K3

---
 erts/lib_src/common/erl_misc_utils.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'erts')

diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c
index 116c9886d8..498ce6837a 100644
--- a/erts/lib_src/common/erl_misc_utils.c
+++ b/erts/lib_src/common/erl_misc_utils.c
@@ -1228,7 +1228,10 @@ read_topology(erts_cpu_info_t *cpuinfo)
 	    nodes++;
     }
 
-    core_id = malloc(sizeof(int)*(packages ? packages : 1));
+    if (!packages) {
+      packages = 1;
+    }
+    core_id = malloc(sizeof(int)*packages);
     if (!core_id) {
 	res = -ENOMEM;
 	goto error;
@@ -1286,11 +1289,13 @@ read_topology(erts_cpu_info_t *cpuinfo)
 		 * Nodes and packages may not be supported; pretend
 		 * that there are one if this is the case...
 		 */
-		if (!nodes)
-		    cpuinfo->topology[l].node = 0;
-		if (!packages)
-		    cpuinfo->topology[l].processor = 0;
 		if (slpip[rix].ProcessorMask & (((ULONG_PTR) 1) << l)) {
+		    if (!nodes) {
+		      cpuinfo->topology[l].node = 0;
+		    }
+		    if (!packages) {
+		      cpuinfo->topology[l].processor = 0;
+		    }
 		    if (processor < 0) {
 			processor = cpuinfo->topology[l].processor;
 			if (processor < 0) {
-- 
cgit v1.2.3


From 3ffb56672f9b51c5e1080c53b62a3e60983dfdfc Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 5 Oct 2010 10:43:00 +0200
Subject: Prepare release

---
 erts/doc/src/notes.xml | 19 +++++++++++++++++++
 erts/vsn.mk            |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'erts')

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index efe2dada9c..532ebc29e2 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,25 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 5.8.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Windows 2003 and Windows XP pre SP3 would sometimes not
+	    start the Erlang R14B VM at all due to a bug in the cpu
+	    topology detection. The bug affects Windows only, no
+	    other platform is even remotely affected. The bug is now
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-8876</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 5.8.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index ce6330e6dd..af9744f012 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -17,7 +17,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 5.8.1
+VSN = 5.8.1.1
 SYSTEM_VSN = R14B
 
 # Port number 4365 in 4.2
-- 
cgit v1.2.3