PERFORCE change 48255 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=48255

Change 48255 by peter at peter_daintree on 2004/03/05 17:04:24

	IFC @48253

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#20 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#27 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#20 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.128 2003/11/21 03:01:59 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.129 2004/03/06 00:51:30 peter Exp $");
 
 #include "opt_cpu.h"
 
@@ -123,8 +123,8 @@
 	}
 
 	if (strcmp(cpu_vendor, "GenuineIntel") == 0) {
-		/* How the hell did you get here?? */
-		strcat(cpu_model, "Yamhill?");
+		/* Better late than never I suppose.. */
+		strcat(cpu_model, "IA-32e");
 	} else if (strcmp(cpu_vendor, "AuthenticAMD") == 0) {
 		/*
 		 * Values taken from AMD Processor Recognition

==== //depot/projects/hammer/sys/kern/kern_fork.c#27 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.217 2004/03/05 22:37:32 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.218 2004/03/06 00:44:59 peter Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
@@ -471,9 +471,13 @@
 	ke2 = FIRST_KSE_IN_KSEGRP(kg2);
 
 	/* Allocate and switch to an alternate kstack if specified. */
-	if (pages != 0)
+	if (pages != 0) {
+		mtx_lock(&Giant);
 		vm_thread_new_altkstack(td2, pages);
+		mtx_unlock(&Giant);
+	}
 
+	mtx_lock(&Giant);	/* XXX: for VREF() */
 	PROC_LOCK(p2);
 	PROC_LOCK(p1);