Date: Mon, 17 Nov 2003 01:10:46 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 42654 for review Message-ID: <200311170910.hAH9Ak1K093532@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=42654 Change 42654 by peter@peter_overcee on 2003/11/17 01:09:46 IFC (merge commit) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_interface.c#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.S#24 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#26 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#16 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#22 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#25 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#70 edit .. //depot/projects/hammer/sys/amd64/amd64/mem.c#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#41 integrate .. //depot/projects/hammer/sys/amd64/amd64/mpboot.S#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#16 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#44 integrate .. //depot/projects/hammer/sys/amd64/amd64/support.S#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#33 integrate .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#19 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_syscall.c#9 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#18 integrate .. //depot/projects/hammer/sys/amd64/include/asmacros.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/atomic.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/clock.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#18 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/pcpu.h#15 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#23 integrate .. //depot/projects/hammer/sys/amd64/include/segments.h#15 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/tss.h#7 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#29 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#11 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#16 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#9 integrate .. //depot/projects/hammer/sys/conf/files.amd64#35 integrate .. //depot/projects/hammer/sys/conf/options.amd64#18 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#13 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#19 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#22 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#11 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.94 2003/11/14 19:10:12 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.95 2003/11/17 08:58:12 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/autoconf.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.175 2003/11/12 01:49:49 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.176 2003/11/17 08:58:12 peter Exp $"); /* * Setup the system to run on the current machine. ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#13 (text+ko) ==== @@ -34,7 +34,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.143 2003/11/08 04:39:21 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.144 2003/11/17 08:58:12 peter Exp $ */ #include <machine/asmacros.h> ==== //depot/projects/hammer/sys/amd64/amd64/db_interface.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.74 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.75 2003/11/17 08:58:12 peter Exp $"); /* * Interface to new debugger. ==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.58 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.59 2003/11/17 08:58:12 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/hammer/sys/amd64/amd64/exception.S#24 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.114 2003/11/13 02:38:33 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.115 2003/11/17 08:58:12 peter Exp $ */ #include <machine/asmacros.h> ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.145 2003/11/08 04:37:54 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.146 2003/11/17 08:58:12 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#26 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.149 2003/09/30 04:52:24 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.150 2003/11/17 08:58:12 peter Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#16 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.126 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.127 2003/11/17 08:58:12 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#22 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.6 2003/11/12 18:13:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.7 2003/11/17 08:58:12 peter Exp $"); #include "opt_atpic.h" #include "opt_isa.h" ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#25 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.3 2003/11/14 19:10:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.4 2003/11/17 08:58:12 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#70 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.598 2003/11/15 18:58:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.599 2003/11/17 08:58:12 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#11 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.110 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.111 2003/11/17 08:58:12 peter Exp $"); /* * Memory special file ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#41 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.225 2003/11/16 00:55:53 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.226 2003/11/17 08:58:12 peter Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" ==== //depot/projects/hammer/sys/amd64/amd64/mpboot.S#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/mpboot.S,v 1.23 2003/11/03 22:32:03 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/mpboot.S,v 1.24 2003/11/17 08:58:12 peter Exp $ */ #include <machine/asmacros.h> /* miscellaneous asm macros */ ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.227 2003/11/14 22:29:21 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.228 2003/11/17 08:58:13 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#16 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.55 2003/11/08 03:33:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.56 2003/11/17 08:58:13 peter Exp $"); /* * This code implements a `root nexus' for Intel Architecture ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#44 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.445 2003/11/08 04:39:21 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.446 2003/11/17 08:58:13 peter Exp $"); /* * Manages physical address maps. ==== //depot/projects/hammer/sys/amd64/amd64/support.S#15 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.103 2003/11/08 04:39:21 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.104 2003/11/17 08:58:13 peter Exp $ */ #include "opt_ddb.h" ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#33 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.269 2003/11/08 03:33:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.270 2003/11/17 08:58:13 peter Exp $"); /* * AMD64 Trap and System call handling ==== //depot/projects/hammer/sys/amd64/amd64/tsc.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.204 2003/10/21 18:28:33 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.205 2003/11/17 08:58:13 peter Exp $"); #include "opt_clock.h" ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#19 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.222 2003/11/16 23:40:06 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.223 2003/11/17 08:58:13 peter Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" ==== //depot/projects/hammer/sys/amd64/ia32/ia32_syscall.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.5 2003/09/22 22:09:02 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.6 2003/11/17 08:58:14 peter Exp $"); /* * 386 Trap and System call handling ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#18 (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.5 2003/11/14 22:21:30 peter Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.6 2003/11/17 08:58:14 peter Exp $ */ #ifndef _MACHINE_APICVAR_H_ ==== //depot/projects/hammer/sys/amd64/include/asmacros.h#7 (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/include/asmacros.h,v 1.25 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.26 2003/11/17 08:58:14 peter Exp $ */ #ifndef _MACHINE_ASMACROS_H_ ==== //depot/projects/hammer/sys/amd64/include/atomic.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.30 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.31 2003/11/17 08:58:14 peter Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ ==== //depot/projects/hammer/sys/amd64/include/clock.h#11 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.48 2003/11/14 22:34:43 peter Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.49 2003/11/17 08:58:14 peter Exp $ */ #ifndef _MACHINE_CLOCK_H_ ==== //depot/projects/hammer/sys/amd64/include/md_var.h#18 (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/md_var.h,v 1.68 2003/09/22 23:33:29 peter Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.69 2003/11/17 08:58:14 peter Exp $ */ #ifndef _MACHINE_MD_VAR_H_ ==== //depot/projects/hammer/sys/amd64/include/param.h#12 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.8 2003/07/31 01:27:18 peter Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.9 2003/11/17 08:58:14 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#15 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.39 2003/11/17 04:40:58 bde Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.40 2003/11/17 08:58:14 peter Exp $ */ #ifndef _MACHINE_PCPU_H_ ==== //depot/projects/hammer/sys/amd64/include/pmap.h#23 (text+ko) ==== @@ -43,7 +43,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.108 2003/11/08 04:39:22 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.109 2003/11/17 08:58:14 peter Exp $ */ #ifndef _MACHINE_PMAP_H_ ==== //depot/projects/hammer/sys/amd64/include/segments.h#15 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/segments.h,v 1.36 2003/09/22 22:09:02 peter Exp $ + * $FreeBSD: src/sys/amd64/include/segments.h,v 1.37 2003/11/17 08:58:14 peter Exp $ */ #ifndef _MACHINE_SEGMENTS_H_ ==== //depot/projects/hammer/sys/amd64/include/smp.h#14 (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.77 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.78 2003/11/17 08:58:14 peter Exp $ * */ ==== //depot/projects/hammer/sys/amd64/include/tss.h#7 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)tss.h 5.4 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/tss.h,v 1.14 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/tss.h,v 1.15 2003/11/17 08:58:14 peter Exp $ */ #ifndef _MACHINE_TSS_H_ ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#29 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.5 2003/11/14 21:02:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.6 2003/11/17 08:58:15 peter Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" ==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#11 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/isa/atpic_vector.S,v 1.40 2003/11/14 20:06:24 peter Exp $ + * $FreeBSD: src/sys/amd64/isa/atpic_vector.S,v 1.41 2003/11/17 08:58:15 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/isa/clock.c#16 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.205 2003/11/14 22:34:43 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.206 2003/11/17 08:58:15 peter Exp $"); /* * Routines to handle clock hardware. ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.104 2003/09/23 00:04:28 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.105 2003/11/17 08:58:15 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/hammer/sys/conf/files.amd64#35 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.25 2003/11/08 02:40:40 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.26 2003/11/17 08:58:16 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/hammer/sys/conf/options.amd64#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.amd64,v 1.9 2003/06/18 15:25:01 jake Exp $ +# $FreeBSD: src/sys/conf/options.amd64,v 1.10 2003/11/17 08:58:16 peter Exp $ # Options specific to AMD64 platform kernels AUTO_EOI_1 opt_auto_eoi.h ==== //depot/projects/hammer/sys/dev/pci/pci.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pci.c,v 1.235 2003/11/03 22:06:35 jhb Exp $ + * $FreeBSD: src/sys/dev/pci/pci.c,v 1.236 2003/11/17 08:58:16 peter Exp $ * */ ==== //depot/projects/hammer/sys/kern/kern_switch.c#13 (text+ko) ==== @@ -86,7 +86,7 @@ ***/ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.62 2003/10/17 20:53:04 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.63 2003/11/17 08:58:16 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/hammer/sys/kern/sched_ule.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.81 2003/11/15 07:32:07 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.83 2003/11/17 08:27:11 jeff Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -218,9 +218,8 @@ #ifdef SMP int ksq_load_transferable; /* kses that may be migrated. */ int ksq_idled; - unsigned int ksq_rslices; /* Slices on run queue */ int ksq_cpus; /* Count of CPUs in this kseq. */ - struct kse *ksq_assigned; /* KSEs assigned by another CPU. */ + volatile struct kse *ksq_assigned; /* assigned by another CPU. */ #endif }; @@ -257,9 +256,6 @@ static void kseq_nice_rem(struct kseq *kseq, int nice); void kseq_print(int cpu); #ifdef SMP -#if 0 -static int sched_pickcpu(void); -#endif static struct kse *runq_steal(struct runq *rq); static void sched_balance(void *arg); static void kseq_move(struct kseq *from, int cpu); @@ -322,9 +318,6 @@ class = PRI_BASE(ke->ke_ksegrp->kg_pri_class); if (class == PRI_TIMESHARE) kseq->ksq_load_timeshare++; -#ifdef SMP - kseq->ksq_rslices += ke->ke_slice; -#endif kseq->ksq_load++; if (ke->ke_ksegrp->kg_pri_class == PRI_TIMESHARE) CTR6(KTR_ULE, @@ -343,9 +336,6 @@ class = PRI_BASE(ke->ke_ksegrp->kg_pri_class); if (class == PRI_TIMESHARE) kseq->ksq_load_timeshare--; -#ifdef SMP - kseq->ksq_rslices -= ke->ke_slice; -#endif kseq->ksq_load--; ke->ke_runq = NULL; if (ke->ke_ksegrp->kg_pri_class == PRI_TIMESHARE) @@ -496,7 +486,7 @@ struct kse *ke; do { - ke = kseq->ksq_assigned; + (volatile struct kse *)ke = kseq->ksq_assigned; } while(!atomic_cmpset_ptr(&kseq->ksq_assigned, ke, NULL)); for (; ke != NULL; ke = nke) { nke = ke->ke_assign; @@ -520,7 +510,7 @@ * Place a KSE on another cpu's queue and force a resched. */ do { - ke->ke_assign = kseq->ksq_assigned; + (volatile struct kse *)ke->ke_assign = kseq->ksq_assigned; } while(!atomic_cmpset_ptr(&kseq->ksq_assigned, ke->ke_assign, ke)); pcpu = pcpu_find(cpu); td = pcpu->pc_curthread; @@ -628,7 +618,6 @@ kseq->ksq_load_timeshare = 0; #ifdef SMP kseq->ksq_load_transferable = 0; - kseq->ksq_rslices = 0; kseq->ksq_idled = 0; kseq->ksq_assigned = NULL; #endif @@ -863,38 +852,6 @@ ke->ke_ftick = ke->ke_ltick - SCHED_CPU_TICKS; } -#if 0 -/* XXX Should be changed to kseq_load_lowest() */ -int -sched_pickcpu(void) -{ - struct kseq *kseq; - int load; - int cpu; - int i; - - mtx_assert(&sched_lock, MA_OWNED); - if (!smp_started) - return (0); - - load = 0; - cpu = 0; - - for (i = 0; i < mp_maxid; i++) { - if (CPU_ABSENT(i) || (i & stopped_cpus) != 0) - continue; - kseq = KSEQ_CPU(i); - if (kseq->ksq_load < load) { - cpu = i; - load = kseq->ksq_load; - } - } - - CTR1(KTR_ULE, "sched_pickcpu: %d", cpu); - return (cpu); -} -#endif - void sched_prio(struct thread *td, u_char prio) { @@ -1062,7 +1019,7 @@ { child->ke_slice = 1; /* Attempt to quickly learn interactivity. */ - child->ke_cpu = ke->ke_cpu; /* sched_pickcpu(); */ + child->ke_cpu = ke->ke_cpu; child->ke_runq = NULL; /* Grab our parents cpu estimation information. */ @@ -1227,17 +1184,12 @@ /* * We used up one time slice. */ - ke->ke_slice--; - kseq = KSEQ_SELF(); -#ifdef SMP - kseq->ksq_rslices--; -#endif - - if (ke->ke_slice > 0) + if (--ke->ke_slice > 0) return; /* * We're out of time, recompute priorities and requeue. */ + kseq = KSEQ_SELF(); kseq_load_rem(kseq, ke); sched_priority(kg); sched_slice(ke); ==== //depot/projects/hammer/sys/kern/subr_witness.c#22 (text+ko) ==== @@ -82,7 +82,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.163 2003/11/16 00:55:54 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.164 2003/11/17 08:58:16 peter Exp $"); #include "opt_ddb.h" #include "opt_witness.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311170910.hAH9Ak1K093532>