From owner-p4-projects@FreeBSD.ORG  Fri Mar  5 17:05:11 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0E83016A4D0; Fri,  5 Mar 2004 17:05:11 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DD12716A4CE
	for <perforce@freebsd.org>; Fri,  5 Mar 2004 17:05:10 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D756F43D2D
	for <perforce@freebsd.org>; Fri,  5 Mar 2004 17:05:10 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2615AGe054381
	for <perforce@freebsd.org>; Fri, 5 Mar 2004 17:05:10 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2615AHl054378
	for perforce@freebsd.org; Fri, 5 Mar 2004 17:05:10 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Fri, 5 Mar 2004 17:05:10 -0800 (PST)
Message-Id: <200403060105.i2615AHl054378@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 48255 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Mar 2004 01:05:11 -0000

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

Change 48255 by peter@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);