From owner-p4-projects@FreeBSD.ORG Sun May 16 15:17:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCA1D16A4D0; Sun, 16 May 2004 15:17:49 -0700 (PDT) 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 8ED2D16A4CE for ; Sun, 16 May 2004 15:17:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47A2643D3F for ; Sun, 16 May 2004 15:17:48 -0700 (PDT) (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 i4GMHmGe031010 for ; Sun, 16 May 2004 15:17:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i4GMHl47031007 for perforce@freebsd.org; Sun, 16 May 2004 15:17:47 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sun, 16 May 2004 15:17:47 -0700 (PDT) Message-Id: <200405162217.i4GMHl47031007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 52887 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 May 2004 22:17:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=52887 Change 52887 by peter@peter_overcee on 2004/05/16 15:17:11 IFC @52886 Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#20 integrate .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#26 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#60 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#66 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#40 edit .. //depot/projects/hammer/sys/amd64/conf/NOTES#30 edit .. //depot/projects/hammer/sys/amd64/include/apicvar.h#23 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#17 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#20 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.97 2004/04/05 21:25:51 imp Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.98 2004/05/16 22:11:49 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#26 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.148 2004/04/05 23:55:13 imp Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.149 2004/05/16 22:11:49 peter Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#60 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.236 2004/03/18 02:53:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.237 2004/05/16 22:11:50 peter Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#66 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.458 2004/05/16 20:44:41 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.459 2004/05/16 22:11:50 peter Exp $"); /* * Manages physical address maps. ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#40 (text+ko) ==== @@ -26,7 +26,6 @@ #hints "GENERIC.hints" # Default places to look for devices. makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols -makeoptions NO_MODULES=not_yet options SCHED_ULE # ULE scheduler options INET # InterNETworking ==== //depot/projects/hammer/sys/amd64/conf/NOTES#30 (text+ko) ==== @@ -8,9 +8,6 @@ # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.13 2004/05/16 21:27:29 peter Exp $ # -# We don't have modules on amd64. -makeoptions NO_MODULES=not_yet - # # This directive is mandatory; it defines the architecture to be # configured for; in this case, the AMD64 family based machines. ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#23 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.7 2004/05/16 20:30:46 peter Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.8 2004/05/16 22:11:50 peter Exp $ */ #ifndef _MACHINE_APICVAR_H_ ==== //depot/projects/hammer/sys/amd64/include/smp.h#17 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.79 2004/01/28 23:51:16 peter Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.80 2004/05/16 22:11:50 peter Exp $ * */ @@ -44,8 +44,7 @@ IDTVEC(statclock), /* Forward statclock() */ IDTVEC(cpuast), /* Additional software trap on other cpu */ IDTVEC(cpustop), /* CPU stops & waits to be restarted */ - IDTVEC(rendezvous), /* handle CPU rendezvous */ - IDTVEC(lazypmap); /* handle lazy pmap release */ + IDTVEC(rendezvous); /* handle CPU rendezvous */ /* functions in mp_machdep.c */ void cpu_add(u_int apic_id, char boot_cpu);