head	1.1;
access;
symbols
	perseant-exfatfs-base-20250801:1.1
	perseant-exfatfs-base-20240630:1.1
	perseant-exfatfs:1.1.0.138
	perseant-exfatfs-base:1.1
	bouyer-sunxi-drm:1.1.0.136
	bouyer-sunxi-drm-base:1.1
	cjep_sun2x:1.1.0.134
	cjep_sun2x-base:1.1
	cjep_staticlib_x-base1:1.1
	cjep_staticlib_x:1.1.0.132
	cjep_staticlib_x-base:1.1
	thorpej-futex-base:1.1
	bouyer-xenpvh-base2:1.1
	phil-wifi-20200421:1.1
	bouyer-xenpvh-base1:1.1
	phil-wifi-20200411:1.1
	bouyer-xenpvh:1.1.0.130
	bouyer-xenpvh-base:1.1
	phil-wifi-20200406:1.1
	ad-namecache-base3:1.1
	ad-namecache-base2:1.1
	ad-namecache-base1:1.1
	ad-namecache:1.1.0.128
	ad-namecache-base:1.1
	isaki-audio2:1.1.0.126
	isaki-audio2-base:1.1
	pgoyette-compat-merge-20190127:1.1
	pgoyette-compat-20190127:1.1
	pgoyette-compat-20190118:1.1
	pgoyette-compat-1226:1.1
	pgoyette-compat-1126:1.1
	pgoyette-compat-1020:1.1
	pgoyette-compat-0930:1.1
	pgoyette-compat-0906:1.1
	pgoyette-compat-0728:1.1
	pgoyette-compat-0625:1.1
	pgoyette-compat-0521:1.1
	pgoyette-compat-0502:1.1
	pgoyette-compat-0422:1.1
	pgoyette-compat-0415:1.1
	pgoyette-compat-0407:1.1
	pgoyette-compat-0330:1.1
	pgoyette-compat-0322:1.1
	pgoyette-compat-0315:1.1
	pgoyette-compat:1.1.0.6
	pgoyette-compat-base:1.1
	perseant-stdc-iso10646:1.1.0.124
	perseant-stdc-iso10646-base:1.1
	prg-localcount2-base3:1.1
	prg-localcount2-base2:1.1
	prg-localcount2-base1:1.1
	prg-localcount2:1.1.0.122
	prg-localcount2-base:1.1
	pgoyette-localcount-20170426:1.1
	bouyer-socketcan-base1:1.1
	pgoyette-localcount-20170320:1.1
	bouyer-socketcan:1.1.0.120
	bouyer-socketcan-base:1.1
	pgoyette-localcount-20170107:1.1
	pgoyette-localcount-20161104:1.1
	localcount-20160914:1.1
	pgoyette-localcount-20160806:1.1
	pgoyette-localcount-20160726:1.1
	pgoyette-localcount:1.1.0.118
	pgoyette-localcount-base:1.1
	netbsd-5-2-3-RELEASE:1.1
	netbsd-5-1-5-RELEASE:1.1
	yamt-pagecache-base9:1.1
	yamt-pagecache-tag8:1.1
	tls-earlyentropy:1.1.0.116
	tls-earlyentropy-base:1.1
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1
	riastradh-drm2-base3:1.1
	netbsd-5-2-2-RELEASE:1.1
	netbsd-5-1-4-RELEASE:1.1
	netbsd-5-2-1-RELEASE:1.1
	netbsd-5-1-3-RELEASE:1.1
	rmind-smpnet-nbase:1.1
	rmind-smpnet:1.1.0.112
	rmind-smpnet-base:1.1
	agc-symver:1.1.0.114
	agc-symver-base:1.1
	tls-maxphys-base:1.1
	yamt-pagecache-base8:1.1
	netbsd-5-2:1.1.0.110
	yamt-pagecache-base7:1.1
	netbsd-5-2-RELEASE:1.1
	netbsd-5-2-RC1:1.1
	yamt-pagecache-base6:1.1
	yamt-pagecache-base5:1.1
	yamt-pagecache-base4:1.1
	netbsd-5-1-2-RELEASE:1.1
	netbsd-5-1-1-RELEASE:1.1
	jmcneill-usbmp:1.1.0.108
	jmcneill-usbmp-base:1.1
	jmcneill-audiomp3:1.1.0.106
	jmcneill-audiomp3-base:1.1
	yamt-pagecache-base3:1.1
	yamt-pagecache-base2:1.1
	yamt-pagecache:1.1.0.104
	yamt-pagecache-base:1.1
	rmind-uvmplock-nbase:1.1
	jym-xensuspend-nbase:1.1
	bouyer-quota2-nbase:1.1
	bouyer-quota2:1.1.0.102
	bouyer-quota2-base:1.1
	jruoho-x86intr:1.1.0.100
	jruoho-x86intr-base:1.1
	matt-nb5-pq3:1.1.0.98
	matt-nb5-pq3-base:1.1
	netbsd-5-1:1.1.0.96
	netbsd-5-1-RELEASE:1.1
	yamt-nfs-mp-base11:1.1
	netbsd-5-1-RC4:1.1
	uebayasi-xip-base2:1.1
	yamt-nfs-mp-base10:1.1
	netbsd-5-1-RC3:1.1
	netbsd-5-1-RC2:1.1
	netbsd-5-1-RC1:1.1
	rmind-uvmplock:1.1.0.94
	rmind-uvmplock-base:1.1
	yamt-nfs-mp-base9:1.1
	uebayasi-xip:1.1.0.92
	uebayasi-xip-base:1.1
	netbsd-5-0-2-RELEASE:1.1
	yamt-nfs-mp-base8:1.1
	yamt-nfs-mp-base7:1.1
	netbsd-5-0-1-RELEASE:1.1
	jymxensuspend-base:1.1
	yamt-nfs-mp-base6:1.1
	yamt-nfs-mp-base5:1.1
	yamt-nfs-mp-base4:1.1
	yamt-nfs-mp-base3:1.1
	netbsd-5-0:1.1.0.90
	netbsd-5-0-RELEASE:1.1
	netbsd-5-0-RC4:1.1
	netbsd-5-0-RC3:1.1
	netbsd-5-0-RC2:1.1
	jym-xensuspend:1.1.0.88
	jym-xensuspend-base:1.1
	netbsd-5-0-RC1:1.1
	haad-dm-base2:1.1
	haad-nbase2:1.1
	ad-audiomp2:1.1.0.86
	ad-audiomp2-base:1.1
	netbsd-5:1.1.0.84
	netbsd-5-base:1.1
	haad-dm-base1:1.1
	haad-dm:1.1.0.82
	haad-dm-base:1.1
	simonb-wapbl-nbase:1.1
	yamt-pf42-base4:1.1
	simonb-wapbl:1.1.0.80
	simonb-wapbl-base:1.1
	yamt-pf42-base3:1.1
	hpcarm-cleanup-nbase:1.1
	yamt-pf42-base2:1.1
	yamt-nfs-mp-base2:1.1
	yamt-nfs-mp:1.1.0.78
	yamt-nfs-mp-base:1.1
	yamt-pf42:1.1.0.76
	yamt-pf42-base:1.1
	ad-socklock-base1:1.1
	yamt-lazymbuf-base15:1.1
	yamt-lazymbuf-base14:1.1
	keiichi-mipv6-nbase:1.1
	mjf-devfs2:1.1.0.74
	mjf-devfs2-base:1.1
	keiichi-mipv6:1.1.0.72
	keiichi-mipv6-base:1.1
	bouyer-xeni386-merge1:1.1
	vmlocking2-base3:1.1
	bouyer-xeni386-nbase:1.1
	yamt-kmem-base3:1.1
	cube-autoconf:1.1.0.70
	cube-autoconf-base:1.1
	yamt-kmem-base2:1.1
	bouyer-xeni386:1.1.0.68
	bouyer-xeni386-base:1.1
	yamt-kmem:1.1.0.66
	yamt-kmem-base:1.1
	vmlocking2-base2:1.1
	reinoud-bufcleanup-nbase:1.1
	vmlocking2:1.1.0.64
	vmlocking2-base1:1.1
	jmcneill-base:1.1
	mjf-devfs:1.1.0.62
	mjf-devfs-base:1.1
	bouyer-xenamd64-base2:1.1
	vmlocking-nbase:1.1
	yamt-x86pmap-base4:1.1
	bouyer-xenamd64:1.1.0.60
	bouyer-xenamd64-base:1.1
	yamt-x86pmap-base3:1.1
	yamt-x86pmap-base2:1.1
	yamt-x86pmap:1.1.0.58
	yamt-x86pmap-base:1.1
	jmcneill-pm:1.1.0.56
	jmcneill-pm-base:1.1
	hpcarm-cleanup:1.1.0.54
	hpcarm-cleanup-base:1.1
	mjf-ufs-trans-base:1.1
	yamt-idlelwp-base8:1.1
	ppcoea-renovation:1.1.0.52
	ppcoea-renovation-base:1.1
	reinoud-bufcleanup-base:1.1
	vmlocking:1.1.0.50
	vmlocking-base:1.1
	ad-audiomp:1.1.0.48
	ad-audiomp-base:1.1
	yamt-idlelwp:1.1.0.46
	post-newlock2-merge:1.1
	newlock2-nbase:1.1
	yamt-splraiseipl-base5:1.1
	yamt-splraiseipl-base4:1.1
	yamt-splraiseipl-base3:1.1
	yamt-splraiseipl-base2:1.1
	yamt-splraiseipl:1.1.0.44
	yamt-splraiseipl-base:1.1
	newlock2:1.1.0.42
	newlock2-base:1.1
	yamt-pdpolicy-base8:1.1
	yamt-pdpolicy-base7:1.1
	yamt-pdpolicy-base6:1.1
	gdamore-uart:1.1.0.40
	gdamore-uart-base:1.1
	simonb-timcounters-final:1.1
	yamt-pdpolicy-base5:1.1
	elad-kernelauth-nbase:1.1
	yamt-pdpolicy-base4:1.1
	yamt-pdpolicy-base3:1.1
	yamt-pdpolicy-base2:1.1
	yamt-pdpolicy:1.1.0.38
	yamt-pdpolicy-base:1.1
	yamt-uio_vmspace-base5:1.1
	simonb-timecounters:1.1.0.36
	simonb-timecounters-base:1.1
	rpaulo-netinet-merge-pcb:1.1.0.34
	rpaulo-netinet-merge-pcb-base:1.1
	yamt-uio_vmspace:1.1.0.32
	yamt-readahead-base3:1.1
	yamt-readahead-base2:1.1
	yamt-readahead:1.1.0.30
	yamt-readahead-base:1.1
	yamt-vop-base3:1.1
	yamt-vop-base2:1.1
	thorpej-vnode-attr:1.1.0.28
	thorpej-vnode-attr-base:1.1
	yamt-vop:1.1.0.26
	yamt-vop-base:1.1
	yamt-lazymbuf:1.1.0.24
	yamt-km-base4:1.1
	yamt-km-base3:1.1
	yamt-km-base2:1.1
	yamt-km:1.1.0.22
	yamt-km-base:1.1
	kent-audio2:1.1.0.20
	kent-audio2-base:1.1
	ktrace-lwp:1.1.0.18
	ktrace-lwp-base:1.1
	nathanw_sa_before_merge:1.1
	gmcgarry_ctxsw:1.1.0.16
	gmcgarry_ctxsw_base:1.1
	gmcgarry_ucred:1.1.0.14
	gmcgarry_ucred_base:1.1
	nathanw_sa_base:1.1
	i386mp_plus16_stable:1.1.2.6
	gehenna-devsw:1.1.0.12
	gehenna-devsw-base:1.1
	eeh-devprop:1.1.0.10
	eeh-devprop-base:1.1
	newlock:1.1.0.8
	newlock-base:1.1
	ifpoll-base:1.1
	kqueue-base:1.1
	thorpej-mips-cache:1.1.0.4
	thorpej-mips-cache-base:1.1
	sommerfeld_i386mp_1:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2001.09.24.01.35.59;	author sommerfeld;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2001.09.24.01.35.59;	author sommerfeld;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2001.12.29.21.09.02;	author sommerfeld;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2002.01.28.04.21.35;	author sommerfeld;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2002.02.24.00.17.40;	author sommerfeld;	state Exp;
branches;
next	1.1.2.5;

1.1.2.5
date	2002.04.27.20.24.43;	author sommerfeld;	state Exp;
branches;
next	1.1.2.6;

1.1.2.6
date	2002.05.18.17.27.30;	author sommerfeld;	state Exp;
branches;
next	1.1.2.7;

1.1.2.7
date	2002.06.25.15.44.43;	author sommerfeld;	state Exp;
branches;
next	1.1.2.8;

1.1.2.8
date	2002.08.19.01.22.14;	author sommerfeld;	state Exp;
branches;
next	1.1.2.9;

1.1.2.9
date	2002.08.31.20.31.33;	author sommerfeld;	state Exp;
branches;
next	;


desc
@@


1.1
log
@file MP-UPDATING was initially added on branch sommerfeld_i386mp_1.
@
text
@@


1.1.2.1
log
@Synch again with current, largely to test updates to my merge tools
which drop an entry in MP-UPDATING so there's a deterministic way to
discover the time of the last branch synch..
@
text
@a0 9
Last Synchronized: Sun Sep 23 21:12:12 EDT 2001

Now using new toolchain.  Most (but not all) of the new assembler
warnings are now fixed.  Has all the ubcperf, new-dirpref, poolified
softdeps, and assorted other goodness.




@


1.1.2.2
log
@Yet another mergeup.

New work:
 - Frank van der Linden's tlb shootdown fix.
Mainline functionality merged:
 - IrDA
 - Kernel RCSID's
 - Transmeta CPU support
 - ACPI
 - XMM register access through procfs
@
text
@a0 13
Last Synchronized: Sat Dec 29 14:45:06 EST 2001

Yet another mergeup.  

New work:
 - Frank van der Linden's tlb shootdown fix.
Mainline functionality merged:
 - IrDA
 - Kernel RCSID's
 - Transmeta CPU support
 - ACPI
 - XMM register access through procfs

@


1.1.2.3
log
@Yet Another mergeup with -current.
@
text
@a0 9
Last Synchronized: Sun Jan 27 22:33:13 EST 2002

Yet another mergeup.

Note that the mainline got RAIDframe added to GENERIC; however, this
has been commented out on the branch because RAIDframe currently
doesn't use locks correctly; with LOCKDEBUG, you'll panic, which means
without LOCKDEBUG, you'll likely probably deadlock/hang in ugly ways.

@


1.1.2.4
log
@Resynch with mainline.
@
text
@a0 4
Last Synchronized: Sat Feb 23 18:41:03 EST 2002

Pick up pxeboot; merge in joystick rototill, linux compat changes.

@


1.1.2.5
log
@Merge with current as of today
@
text
@a0 5
Last Synchronized: Sat Apr 27 11:54:52 EDT 2002

merged with -current as of today.
Added TRAPLOG support, fixed misc. minor bugs in ioapic.c, mpbios.c

@


1.1.2.6
log
@Catch up with -current.  (commons elimination, changes to MI pci framework)
@
text
@a0 5
Last Synchronized: Sat May 18 12:48:18 EDT 2002

merged with -current as of today.
Merged with mainline common elimination, new MI pci framework.

@


1.1.2.7
log
@Resynch with -current.
@
text
@a0 9
Last Synchronized: Tue Jun 25 10:28:59 EDT 2002

merged with -current as of today.
Improved softint locking (thanks, Frank)
Has new ACPI code and systrace.
Revised low-physmem allocation in machdep.c
Note: options PERFCTRS needs work for MP (each cpu has separate counters..)
so has been disabled in this branch GENERIC.

@


1.1.2.8
log
@merged with -current as of today.
rearranged gdt init to deal with KVM86 changes; however, KVM86 has no
chance of working yet; good thing it's not part of GENERIC
@
text
@a0 6
Last Synchronized: Sun Aug 18 19:21:52 EDT 2002

merged with -current as of today.
rearranged gdt init to deal with KVM86 changes; however, KVM86 has no
chance of working yet; good thing it's not part of GENERIC

@


1.1.2.9
log
@SMP branch resync.  Mostly RAS support.
@
text
@a0 5
Last Synchronized: Sat Aug 31 12:58:28 EDT 2002

merged with -current as of today.
merged in restartable atomic sequence support.

d57 4
@