From owner-p4-projects  Fri Jul 26 11: 1: 9 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ACCA837B405; Fri, 26 Jul 2002 10:59:24 -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 24E6037B400
	for <perforce@freebsd.org>; Fri, 26 Jul 2002 10:59:24 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 37D9943E3B
	for <perforce@freebsd.org>; Fri, 26 Jul 2002 10:59:23 -0700 (PDT)
	(envelope-from jhb@freebsd.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6QHxNJU046682
	for <perforce@freebsd.org>; Fri, 26 Jul 2002 10:59:23 -0700 (PDT)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6QHxK1T046678
	for perforce@freebsd.org; Fri, 26 Jul 2002 10:59:20 -0700 (PDT)
Date: Fri, 26 Jul 2002 10:59:20 -0700 (PDT)
Message-Id: <200207261759.g6QHxK1T046678@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 14954 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14954

Change 14954 by jhb@jhb_laptop on 2002/07/26 10:59:14

	IFC.

Affected files ...

.. //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#4 integrate
.. //depot/projects/smpng/sys/alpha/alpha/pmap.c#33 integrate
.. //depot/projects/smpng/sys/alpha/conf/GENERIC#21 integrate
.. //depot/projects/smpng/sys/alpha/conf/NOTES#2 integrate
.. //depot/projects/smpng/sys/alpha/conf/SIMOS#6 integrate
.. //depot/projects/smpng/sys/alpha/conf/gethints.awk#1 branch
.. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#7 integrate
.. //depot/projects/smpng/sys/alpha/osf1/imgact_osf1.c#5 integrate
.. //depot/projects/smpng/sys/boot/efi/Makefile.inc#4 integrate
.. //depot/projects/smpng/sys/boot/efi/libefi/efinet.c#3 integrate
.. //depot/projects/smpng/sys/boot/efi/loader/conf.c#6 integrate
.. //depot/projects/smpng/sys/boot/efi/loader/main.c#5 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/elf_freebsd.c#4 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_copy.c#3 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#5 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_memory.c#3 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.c#6 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.h#6 integrate
.. //depot/projects/smpng/sys/boot/pc98/Makefile#3 integrate
.. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#11 integrate
.. //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#6 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#8 integrate
.. //depot/projects/smpng/sys/conf/NOTES#19 integrate
.. //depot/projects/smpng/sys/conf/files#46 integrate
.. //depot/projects/smpng/sys/conf/files.alpha#16 integrate
.. //depot/projects/smpng/sys/conf/files.i386#27 integrate
.. //depot/projects/smpng/sys/conf/files.ia64#17 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#27 integrate
.. //depot/projects/smpng/sys/conf/files.sparc64#18 integrate
.. //depot/projects/smpng/sys/conf/files.x86_64#2 integrate
.. //depot/projects/smpng/sys/conf/gethints.awk#2 delete
.. //depot/projects/smpng/sys/conf/kern.post.mk#13 integrate
.. //depot/projects/smpng/sys/conf/kern.pre.mk#14 integrate
.. //depot/projects/smpng/sys/conf/options#32 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#29 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_button.c#7 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#9 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_lid.c#6 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#16 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_gram.y#5 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.c#21 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-disk.c#20 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-disk.h#9 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-dma.c#23 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-isa.c#6 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.c#22 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-all.c#13 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-all.h#7 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#10 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#14 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#6 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_core.c#5 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_i2c.c#4 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#7 integrate
.. //depot/projects/smpng/sys/dev/buslogic/bt.c#3 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#9 integrate
.. //depot/projects/smpng/sys/dev/exca/exca.c#4 integrate
.. //depot/projects/smpng/sys/dev/exca/excareg.h#2 integrate
.. //depot/projects/smpng/sys/dev/exca/excavar.h#2 integrate
.. //depot/projects/smpng/sys/dev/gem/if_gem.c#7 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#15 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#14 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_pci.c#14 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#2 integrate
.. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#5 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#16 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbbdevid.h#6 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbbreg.h#6 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#6 integrate
.. //depot/projects/smpng/sys/dev/pci/pci.c#13 integrate
.. //depot/projects/smpng/sys/dev/puc/puc.c#5 integrate
.. //depot/projects/smpng/sys/dev/sn/if_sn.c#3 integrate
.. //depot/projects/smpng/sys/dev/sn/if_sn_pccard.c#4 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/csa.c#5 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#7 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#6 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#12 integrate
.. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#1 branch
.. //depot/projects/smpng/sys/dev/sound/usb/uaudio.h#1 branch
.. //depot/projects/smpng/sys/dev/sound/usb/uaudio_pcm.c#1 branch
.. //depot/projects/smpng/sys/dev/sound/usb/uaudioreg.h#1 branch
.. //depot/projects/smpng/sys/dev/sr/if_sr.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#21 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs.h#22 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#22 integrate
.. //depot/projects/smpng/sys/dev/xe/if_xe_pccard.c#3 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#24 integrate
.. //depot/projects/smpng/sys/i386/conf/NEWCARD#14 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#38 integrate
.. //depot/projects/smpng/sys/i386/conf/OLDCARD#3 integrate
.. //depot/projects/smpng/sys/i386/conf/gethints.awk#1 branch
.. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#3 integrate
.. //depot/projects/smpng/sys/i386/i386/identcpu.c#9 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#42 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#24 integrate
.. //depot/projects/smpng/sys/i386/i386/swtch.s#14 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#41 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#9 integrate
.. //depot/projects/smpng/sys/i386/include/atomic.h#9 integrate
.. //depot/projects/smpng/sys/i386/include/cpufunc.h#19 integrate
.. //depot/projects/smpng/sys/i386/include/cputypes.h#2 integrate
.. //depot/projects/smpng/sys/i386/include/md_var.h#11 integrate
.. //depot/projects/smpng/sys/i386/isa/cx.c#6 integrate
.. //depot/projects/smpng/sys/i386/isa/stallion.c#6 integrate
.. //depot/projects/smpng/sys/i386/linux/imgact_linux.c#5 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#19 integrate
.. //depot/projects/smpng/sys/i386/pci/pci_bus.c#6 integrate
.. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#11 integrate
.. //depot/projects/smpng/sys/ia64/acpica/madt.c#7 integrate
.. //depot/projects/smpng/sys/ia64/conf/GENERIC#18 integrate
.. //depot/projects/smpng/sys/ia64/ia32/ia32.h#1 branch
.. //depot/projects/smpng/sys/ia64/ia32/ia32_misc.c#1 branch
.. //depot/projects/smpng/sys/ia64/ia32/ia32_proto.h#2 integrate
.. //depot/projects/smpng/sys/ia64/ia32/ia32_syscall.h#2 integrate
.. //depot/projects/smpng/sys/ia64/ia32/ia32_sysent.c#2 integrate
.. //depot/projects/smpng/sys/ia64/ia32/ia32_sysvec.c#1 branch
.. //depot/projects/smpng/sys/ia64/ia32/ia32_util.h#1 branch
.. //depot/projects/smpng/sys/ia64/ia32/imgact_ia32.c#4 delete
.. //depot/projects/smpng/sys/ia64/ia32/imgact_ia32.h#3 delete
.. //depot/projects/smpng/sys/ia64/ia32/syscalls.master#2 integrate
.. //depot/projects/smpng/sys/ia64/ia64/efi.c#2 integrate
.. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#4 integrate
.. //depot/projects/smpng/sys/ia64/ia64/nexus.c#4 integrate
.. //depot/projects/smpng/sys/ia64/ia64/pmap.c#33 integrate
.. //depot/projects/smpng/sys/ia64/include/elf.h#7 integrate
.. //depot/projects/smpng/sys/kern/bus_if.m#4 integrate
.. //depot/projects/smpng/sys/kern/imgact_aout.c#13 integrate
.. //depot/projects/smpng/sys/kern/imgact_elf.c#15 integrate
.. //depot/projects/smpng/sys/kern/imgact_elf32.c#1 branch
.. //depot/projects/smpng/sys/kern/imgact_elf64.c#1 branch
.. //depot/projects/smpng/sys/kern/imgact_elfN.c#1 branch
.. //depot/projects/smpng/sys/kern/imgact_gzip.c#5 integrate
.. //depot/projects/smpng/sys/kern/init_main.c#20 integrate
.. //depot/projects/smpng/sys/kern/kern_acct.c#16 integrate
.. //depot/projects/smpng/sys/kern/kern_acl.c#16 integrate
.. //depot/projects/smpng/sys/kern/kern_exec.c#40 integrate
.. //depot/projects/smpng/sys/kern/kern_idle.c#8 integrate
.. //depot/projects/smpng/sys/kern/kern_linker.c#23 integrate
.. //depot/projects/smpng/sys/kern/kern_resource.c#26 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#43 integrate
.. //depot/projects/smpng/sys/kern/kern_subr.c#13 integrate
.. //depot/projects/smpng/sys/kern/kern_synch.c#28 integrate
.. //depot/projects/smpng/sys/kern/kern_sysctl.c#20 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/smpng/sys/kern/subr_bus.c#10 integrate
.. //depot/projects/smpng/sys/kern/subr_diskslice.c#12 integrate
.. //depot/projects/smpng/sys/kern/subr_eventhandler.c#8 integrate
.. //depot/projects/smpng/sys/kern/subr_mbuf.c#17 integrate
.. //depot/projects/smpng/sys/kern/sys_generic.c#17 integrate
.. //depot/projects/smpng/sys/kern/sys_pipe.c#20 integrate
.. //depot/projects/smpng/sys/kern/sys_process.c#21 integrate
.. //depot/projects/smpng/sys/kern/sysv_msg.c#14 integrate
.. //depot/projects/smpng/sys/kern/sysv_sem.c#14 integrate
.. //depot/projects/smpng/sys/kern/sysv_shm.c#11 integrate
.. //depot/projects/smpng/sys/kern/tty.c#26 integrate
.. //depot/projects/smpng/sys/kern/uipc_jumbo.c#3 integrate
.. //depot/projects/smpng/sys/kern/uipc_mbuf.c#8 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#25 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket2.c#18 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#23 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#25 integrate
.. //depot/projects/smpng/sys/kern/vfs_lookup.c#12 integrate
.. //depot/projects/smpng/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#29 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#41 integrate
.. //depot/projects/smpng/sys/kern/vfs_vnops.c#28 integrate
.. //depot/projects/smpng/sys/modules/bktr/bktr/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/sound/driver/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/sound/driver/uaudio/Makefile#1 branch
.. //depot/projects/smpng/sys/netinet/in_pcb.c#27 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.h#12 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#3 integrate
.. //depot/projects/smpng/sys/netinet/ip_var.h#6 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#21 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#23 integrate
.. //depot/projects/smpng/sys/netinet/tcp_timer.c#7 integrate
.. //depot/projects/smpng/sys/netinet/tcp_timer.h#3 integrate
.. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#14 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#9 integrate
.. //depot/projects/smpng/sys/netinet6/esp_input.c#7 integrate
.. //depot/projects/smpng/sys/netinet6/in6.h#7 integrate
.. //depot/projects/smpng/sys/netinet6/in6_proto.c#3 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_output.c#11 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_var.h#3 integrate
.. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#17 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#13 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs.h#8 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#10 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#11 integrate
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#23 integrate
.. //depot/projects/smpng/sys/pc98/conf/gethints.awk#1 branch
.. //depot/projects/smpng/sys/pc98/i386/machdep.c#37 integrate
.. //depot/projects/smpng/sys/pccard/cardinfo.h#5 integrate
.. //depot/projects/smpng/sys/pccard/i82365.h#8 integrate
.. //depot/projects/smpng/sys/pccard/pccard.c#14 integrate
.. //depot/projects/smpng/sys/pccard/pcic.c#17 integrate
.. //depot/projects/smpng/sys/pccard/pcic_pci.c#23 integrate
.. //depot/projects/smpng/sys/pccard/pcic_pci.h#10 integrate
.. //depot/projects/smpng/sys/pccard/pcicvar.h#9 integrate
.. //depot/projects/smpng/sys/pccard/slot.h#6 integrate
.. //depot/projects/smpng/sys/pci/agp.c#6 integrate
.. //depot/projects/smpng/sys/pci/agp_i810.c#3 integrate
.. //depot/projects/smpng/sys/pci/uhci_pci.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/conf/GENERIC#7 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#3 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#20 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#17 integrate
.. //depot/projects/smpng/sys/sparc64/include/smp.h#10 integrate
.. //depot/projects/smpng/sys/sparc64/include/tlb.h#13 integrate
.. //depot/projects/smpng/sys/sparc64/include/tte.h#9 integrate
.. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#4 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#6 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#22 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.s#5 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#26 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/tlb.c#3 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#14 integrate
.. //depot/projects/smpng/sys/sys/buf.h#12 integrate
.. //depot/projects/smpng/sys/sys/bus.h#5 integrate
.. //depot/projects/smpng/sys/sys/elf_generic.h#3 integrate
.. //depot/projects/smpng/sys/sys/imgact.h#5 integrate
.. //depot/projects/smpng/sys/sys/imgact_elf.h#5 integrate
.. //depot/projects/smpng/sys/sys/param.h#27 integrate
.. //depot/projects/smpng/sys/sys/proc.h#54 integrate
.. //depot/projects/smpng/sys/sys/resourcevar.h#8 integrate
.. //depot/projects/smpng/sys/sys/socketvar.h#23 integrate
.. //depot/projects/smpng/sys/sys/sysctl.h#11 integrate
.. //depot/projects/smpng/sys/sys/sysent.h#7 integrate
.. //depot/projects/smpng/sys/sys/vnode.h#21 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#14 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#6 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#8 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#8 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#16 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep_stub.c#6 integrate
.. //depot/projects/smpng/sys/ufs/ffs/softdep.h#4 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_bmap.c#6 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#9 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_inode.c#8 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#11 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_readwrite.c#11 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#18 integrate
.. //depot/projects/smpng/sys/vm/swap_pager.c#16 integrate
.. //depot/projects/smpng/sys/vm/uma.h#6 integrate
.. //depot/projects/smpng/sys/vm/vm_contig.c#8 integrate
.. //depot/projects/smpng/sys/vm/vm_extern.h#12 integrate
.. //depot/projects/smpng/sys/vm/vm_fault.c#14 integrate
.. //depot/projects/smpng/sys/vm/vm_glue.c#15 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#19 integrate
.. //depot/projects/smpng/sys/vm/vm_map.h#13 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#16 integrate
.. //depot/projects/smpng/sys/vm/vm_page.c#19 integrate
.. //depot/projects/smpng/sys/vm/vm_page.h#11 integrate
.. //depot/projects/smpng/sys/vm/vm_pageout.c#13 integrate
.. //depot/projects/smpng/sys/vm/vm_pageq.c#6 integrate
.. //depot/projects/smpng/sys/vm/vm_zeroidle.c#8 integrate

Differences ...

==== //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#4 (text+ko) ====

@@ -22,7 +22,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/alpha/alpha/elf_machdep.c,v 1.9 2002/04/25 01:22:15 marcel Exp $
+ * $FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.10 2002/07/20 02:56:09 peter Exp $
  */
 
 #include <sys/param.h>
@@ -32,10 +32,48 @@
 #include <sys/proc.h>
 #include <sys/namei.h>
 #include <sys/fcntl.h>
+#include <sys/sysent.h>
+#include <sys/imgact_elf.h>
+#include <sys/syscall.h>
+#include <sys/signalvar.h>
 #include <sys/vnode.h>
 #include <sys/linker.h>
 #include <machine/elf.h>
+#include <machine/md_var.h>
+
+struct sysentvec elf64_freebsd_sysvec = {
+	SYS_MAXSYSCALL,
+	sysent,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	elf64_freebsd_fixup,
+	sendsig,
+	sigcode,
+	&szsigcode,
+	0,
+	"FreeBSD ELF64",
+	__elfN(coredump),
+	NULL,
+	MINSIGSTKSZ
+};
 
+static Elf64_Brandinfo freebsd_brand_info = {
+						ELFOSABI_FREEBSD,
+						EM_ALPHA,
+						"FreeBSD",
+						"",
+						"/usr/libexec/ld-elf.so.1",
+						&elf64_freebsd_sysvec
+					  };
+
+SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY,
+	(sysinit_cfunc_t) elf64_insert_brand_entry,
+	&freebsd_brand_info);
+
 /* Process one elf relocation with addend. */
 int
 elf_reloc(linker_file_t lf, const void *data, int type)
@@ -85,7 +123,7 @@
 			addr = elf_lookup(lf, symidx, 1);
 			if (addr == 0)
 				return -1;
-                        addr += addend;
+			addr += addend;
 			if (*where != addr)
 				*where = addr;
 			break;

==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#33 (text+ko) ====

@@ -43,7 +43,7 @@
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
  *	from:	i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp
  *		with some ideas from NetBSD's alpha pmap
- * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.100 2002/07/14 23:51:55 alc Exp $
+ * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.101 2002/07/18 04:08:10 alc Exp $
  */
 
 /*
@@ -1561,14 +1561,14 @@
 		if (!pmap_pte_v(pte)) {
 			int pindex = NKLEV3MAPS + pmap_lev1_index(kernel_vm_end) - K1SEGLEV1I;
 
-			nkpg = vm_page_alloc(kptobj, pindex, VM_ALLOC_SYSTEM);
+			nkpg = vm_page_alloc(kptobj, pindex,
+			    VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED);
 			if (!nkpg)
 				panic("pmap_growkernel: no memory to grow kernel");
 			printf("pmap_growkernel: growing to %lx\n", addr);
 			printf("pmap_growkernel: adding new level2 page table\n");
 
 			nklev2++;
-			vm_page_wire(nkpg);
 			pmap_zero_page(nkpg);
 
 			pa = VM_PAGE_TO_PHYS(nkpg);
@@ -1596,13 +1596,12 @@
 		/*
 		 * This index is bogus, but out of the way
 		 */
-		nkpg = vm_page_alloc(kptobj, nklev3, VM_ALLOC_SYSTEM);
+		nkpg = vm_page_alloc(kptobj, nklev3,
+		    VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED);
 		if (!nkpg)
 			panic("pmap_growkernel: no memory to grow kernel");
 
 		nklev3++;
-
-		vm_page_wire(nkpg);
 		pmap_zero_page(nkpg);
 		pa = VM_PAGE_TO_PHYS(nkpg);
 		newlev2 = pmap_phys_to_pte(pa) | PG_V | PG_ASM | PG_KRE | PG_KWE;

==== //depot/projects/smpng/sys/alpha/conf/GENERIC#21 (text+ko) ====

@@ -18,7 +18,7 @@
 #
 # For hardware specific information check HARDWARE.TXT
 #
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.144 2002/07/16 18:20:15 jhb Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.146 2002/07/23 06:36:23 peter Exp $
 
 machine		alpha
 cpu		EV4

==== //depot/projects/smpng/sys/alpha/conf/NOTES#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.145 2002/07/16 15:40:19 jhb Exp $
+# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.147 2002/07/23 06:36:23 peter Exp $
 #
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.

==== //depot/projects/smpng/sys/alpha/conf/SIMOS#6 (text+ko) ====

@@ -11,7 +11,7 @@
 # device lines is present in the ./NOTES file. If you are in doubt as
 # to the purpose or necessity of a line, check first in NOTES.
 #
-# $FreeBSD: src/sys/alpha/conf/SIMOS,v 1.20 2002/07/15 14:33:20 jhb Exp $
+# $FreeBSD: src/sys/alpha/conf/SIMOS,v 1.22 2002/07/23 06:36:23 peter Exp $
 
 machine		alpha
 cpu		EV5

==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#7 (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/alpha/linux/linux_sysvec.c,v 1.82 2002/06/02 20:05:40 schweikh Exp $
+ * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.83 2002/07/20 02:56:09 peter Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -189,13 +189,14 @@
 	&linux_szsigcode,
 	0,
 	"Linux ELF",
-	elf_coredump,
+	elf64_coredump,
 	exec_linux_imgact_try,
 	LINUX_MINSIGSTKSZ
 };
 
 static Elf64_Brandinfo linux_brand = {
 					ELFOSABI_LINUX,
+					EM_ALPHA,
 					"Linux",
 					"/compat/linux",
 					"/lib/ld-linux.so.1",
@@ -204,6 +205,7 @@
 
 static Elf64_Brandinfo linux_glibc2brand = {
 					ELFOSABI_LINUX,
+					EM_ALPHA,
 					"Linux",
 					"/compat/linux",
 					"/lib/ld-linux.so.2",
@@ -229,7 +231,7 @@
 	case MOD_LOAD:
 		for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL;
 		    ++brandinfo)
-			if (elf_insert_brand_entry(*brandinfo) < 0)
+			if (elf64_insert_brand_entry(*brandinfo) < 0)
 				error = EINVAL;
 		if (error == 0) {
 			SET_FOREACH(lihp, linux_ioctl_handler_set)
@@ -242,12 +244,12 @@
 	case MOD_UNLOAD:
 		for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL;
 		    ++brandinfo)
-			if (elf_brand_inuse(*brandinfo))
+			if (elf64_brand_inuse(*brandinfo))
 				error = EBUSY;
 		if (error == 0) {
 			for (brandinfo = &linux_brandlist[0];
 			    *brandinfo != NULL; ++brandinfo)
-				if (elf_remove_brand_entry(*brandinfo) < 0)
+				if (elf64_remove_brand_entry(*brandinfo) < 0)
 					error = EINVAL;
 		}
 		if (error == 0) {

==== //depot/projects/smpng/sys/alpha/osf1/imgact_osf1.c#5 (text+ko) ====

@@ -30,7 +30,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/alpha/osf1/imgact_osf1.c,v 1.11 2002/06/02 20:05:41 schweikh Exp $
+ * $FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.12 2002/07/20 02:56:09 peter Exp $
  */
 
 #include <sys/types.h>
@@ -178,7 +178,7 @@
 	/*
 	 * Destroy old process VM and create a new one (with a new stack).
 	 */
-	exec_new_vmspace(imgp);
+	exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, USRSTACK);
 
 	/*
 	 * The vm space can now be changed.

==== //depot/projects/smpng/sys/boot/efi/Makefile.inc#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.4 2002/04/06 04:29:36 peter Exp $
+# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.5 2002/07/20 03:52:37 peter Exp $
 
 # Options used when building app-specific efi components
-CFLAGS+=	-ffreestanding
+CFLAGS+=	-ffreestanding -Wformat

==== //depot/projects/smpng/sys/boot/efi/libefi/efinet.c#3 (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/boot/efi/libefi/efinet.c,v 1.3 2002/03/30 04:50:52 marcel Exp $
+ * $FreeBSD: src/sys/boot/efi/libefi/efinet.c,v 1.5 2002/07/20 03:52:18 peter Exp $
  */
 
 #include <sys/param.h>
@@ -102,10 +102,14 @@
 		return -1;
 
 	/* Wait for the buffer to be transmitted */
-	buf = 0;	/* XXX Is this needed? */
 	do {
+		buf = 0;	/* XXX Is this needed? */
 		status = net->GetStatus(net, 0, &buf);
-	} while (status == EFI_SUCCESS && buf != pkt);
+		/*
+		 * XXX EFI1.1 and the E1000 card returns a different 
+		 * address than we gave.  Sigh.
+		 */
+	} while (status == EFI_SUCCESS && buf == 0);
 
 	/* XXX How do we deal with status != EFI_SUCCESS now? */
 	return (status == EFI_SUCCESS) ? len : -1;
@@ -120,15 +124,26 @@
 	EFI_STATUS status;
 	UINTN bufsz;
 	time_t t;
+	char buf[2048];
 
 	net = nif->nif_devdata;
 
 	t = time(0);
 	while ((time(0) - t) < timeout) {
-		bufsz = len;
-		status = net->Receive(net, 0, &bufsz, pkt, 0, 0, 0);
-		if (status == EFI_SUCCESS)
+		bufsz = sizeof(buf);
+		status = net->Receive(net, 0, &bufsz, buf, 0, 0, 0);
+		if (status == EFI_SUCCESS) {
+			/*
+			 * XXX EFI1.1 and the E1000 card trash our
+			 * workspace if we do not do this silly copy.
+			 * Either they are not respecting the len
+			 * value or do not like the alignment.
+			 */
+			if (bufsz > len)
+				bufsz = len;
+			bcopy(buf, pkt, bufsz);
 			return bufsz;
+		}
 		if (status != EFI_NOT_READY)
 			return 0;
 	}
@@ -149,7 +164,7 @@
 	if (net->Mode->State == EfiSimpleNetworkStopped) {
 		status = net->Start(net);
 		if (status != EFI_SUCCESS) {
-			printf("net%d: cannot start interface (status=%d)\n",
+			printf("net%d: cannot start interface (status=%ld)\n",
 			    nif->nif_unit, status);
 			return;
 		}
@@ -158,7 +173,7 @@
 	if (net->Mode->State != EfiSimpleNetworkInitialized) {
 		status = net->Initialize(net, 0, 0);
 		if (status != EFI_SUCCESS) {
-			printf("net%d: cannot init. interface (status=%d)\n",
+			printf("net%d: cannot init. interface (status=%ld)\n",
 			    nif->nif_unit, status);
 			return;
 		}
@@ -170,7 +185,7 @@
 
 		status = net->ReceiveFilters(net, mask, 0, FALSE, 0, 0);
 		if (status != EFI_SUCCESS) {
-			printf("net%d: cannot set rx. filters (status=%d)\n",
+			printf("net%d: cannot set rx. filters (status=%ld)\n",
 			    nif->nif_unit, status);
 			return;
 		}

==== //depot/projects/smpng/sys/boot/efi/loader/conf.c#6 (text+ko) ====

@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.6 2002/03/19 10:50:41 peter Exp $";
+  "$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.7 2002/07/20 03:46:43 peter Exp $";
 #endif /* not lint */
 
 #include <stand.h>
@@ -60,7 +60,7 @@
 
 struct fs_ops *file_system[] = {
 	&efi_fsops,
-	&ufs_fsops,
+/*	&ufs_fsops, */
 	&nfs_fsops,
 	&zipfs_fsops,
 	NULL

==== //depot/projects/smpng/sys/boot/efi/loader/main.c#5 (text+ko) ====

@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.10 2002/03/30 07:32:08 marcel Exp $";
+  "$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.11 2002/07/20 03:44:01 peter Exp $";
 #endif /* not lint */
 
 #include <stand.h>
@@ -292,7 +292,7 @@
 {
 	int i;
 
-	printf("NumberOfTableEntries=%d\n", ST->NumberOfTableEntries);
+	printf("NumberOfTableEntries=%ld\n", ST->NumberOfTableEntries);
 	for (i = 0; i < ST->NumberOfTableEntries; i++) {
 		static EFI_GUID mps = MPS_TABLE_GUID;
 		static EFI_GUID acpi = ACPI_TABLE_GUID;
@@ -450,7 +450,7 @@
 		if (!(res.pal_result[0] & 8))
 			buf.pte.pte_ma = 0;
 		sprintf(lbuf,
-			"%d %06x %013x %013x %4s %d  %d  %d  %d %d %-3s %d %06x\n",
+			"%d %06x %013lx %013lx %4s %d  %d  %d  %d %d %-3s %d %06x\n",
 			buf.ifa.ifa_ig & 1,
 			buf.rr.rr_rid,
 			buf.ifa.ifa_vpn,

==== //depot/projects/smpng/sys/boot/ofw/libofw/elf_freebsd.c#4 (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/boot/ofw/libofw/elf_freebsd.c,v 1.3 2002/07/10 12:13:11 benno Exp $
+ * $FreeBSD: src/sys/boot/ofw/libofw/elf_freebsd.c,v 1.4 2002/07/18 12:39:01 benno Exp $
  */
 
 #include <sys/param.h>
@@ -52,11 +52,6 @@
 	if (r != 0)
 		return (r);
 
-	addr = OF_claim((void *)(*result)->f_addr, (*result)->f_size, 0);
-
-	if (addr == (void *)-1 || addr != (void *)(*result)->f_addr)
-		return (ENOMEM);
-
 	return (0);
 }
 

==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_copy.c#3 (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/boot/ofw/libofw/ofw_copy.c,v 1.10 2001/10/07 13:27:27 benno Exp $
+ * $FreeBSD: src/sys/boot/ofw/libofw/ofw_copy.c,v 1.11 2002/07/18 12:39:02 benno Exp $
  */
 /*
  * MD primitives supporting placement of module data 
@@ -35,10 +35,36 @@
 #include "libofw.h"
 
 #define	READIN_BUF	(4 * 1024)
+#define	PAGE_SIZE	0x1000
+#define	PAGE_MASK	0x0fff
 
+#define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))
+
 ssize_t
 ofw_copyin(const void *src, vm_offset_t dest, const size_t len)
 {
+	void	*destp, *addr;
+	size_t	dlen;
+
+	destp = (void *)(dest & ~PAGE_MASK);
+	dlen = roundup(len, PAGE_SIZE);
+
+	if (OF_call_method("claim", memory, 3, 1, destp, dlen, 0, &addr)
+	    == -1) {
+		printf("ofw_copyin: physical claim failed\n");
+		return (0);
+	}
+
+	if (OF_call_method("claim", mmu, 3, 1, destp, dlen, 0, &addr) == -1) {
+		printf("ofw_copyin: virtual claim failed\n");
+		return (0);
+	}
+
+	if (OF_call_method("map", mmu, 4, 0, destp, destp, dlen, 0) == -1) {
+		printf("ofw_copyin: map failed\n");
+		return (0);
+	}
+
 	bcopy(src, (void *)dest, len);
 	return(len);
 }
@@ -76,7 +102,7 @@
 			break;
 		}
 
-		bcopy(buf, (void *)p, got);
+		ofw_copyin(buf, p, got);
 	}
 
 	free(buf);

==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#5 (text+ko) ====

@@ -22,7 +22,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/ofw/libofw/ofw_disk.c,v 1.6 2002/05/11 21:30:46 jake Exp $
+ * $FreeBSD: src/sys/boot/ofw/libofw/ofw_disk.c,v 1.7 2002/07/18 12:39:02 benno Exp $
  */
 
 /*
@@ -181,12 +181,8 @@
 static int
 ofwd_init(void)
 {
-#ifdef __sparc64__
 	/* Short-circuit the device probing, since it takes too long. */
 	return 0;
-#else
-	return ofwd_init_devs();
-#endif
 }
 
 static int

==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_memory.c#3 (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/boot/ofw/libofw/ofw_memory.c,v 1.2 2001/10/15 12:16:20 robert Exp $
+ * $FreeBSD: src/sys/boot/ofw/libofw/ofw_memory.c,v 1.3 2002/07/18 12:39:02 benno Exp $
  */
 
 #include <sys/param.h>
@@ -47,17 +47,15 @@
 void
 ofw_memmap(void)
 {
-        ihandle_t       mmui;
-        phandle_t       mmu;
+        phandle_t       mmup;
         int             nmapping, i;
         struct          ofw_mapping mappings[256];
    
-        OF_getprop(chosen, "mmu", &mmui, 4);
-        mmu = OF_instance_to_package(mmui);
+        mmup = OF_instance_to_package(mmu);
  
         bzero(mappings, sizeof(mappings));
  
-        nmapping = OF_getprop(mmu, "translations", mappings, sizeof(mappings));
+        nmapping = OF_getprop(mmup, "translations", mappings, sizeof(mappings));
 	if (nmapping == -1) {
 		printf("Could not get memory map (%d)\n",
 		    nmapping);
@@ -79,14 +77,12 @@
 void *
 ofw_alloc_heap(unsigned int size)
 {
-	ihandle_t	meminstance;
-	phandle_t	memory;
+	phandle_t	memoryp;
 	struct		ofw_reg available;
 	void		*base;
 
-	OF_getprop(chosen, "memory", &meminstance, sizeof(meminstance));
-	memory = OF_instance_to_package(meminstance);
-	OF_getprop(memory, "available", &available, sizeof(available));
+	memoryp = OF_instance_to_package(memory);
+	OF_getprop(memoryp, "available", &available, sizeof(available));
 
 	heap_base = OF_claim((void *)available.base, size, sizeof(register_t));
 

==== //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.c#6 (text+ko) ====

@@ -54,7 +54,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/ofw/libofw/openfirm.c,v 1.6 2002/02/23 03:36:04 jake Exp $
+ * $FreeBSD: src/sys/boot/ofw/libofw/openfirm.c,v 1.7 2002/07/18 12:39:02 benno Exp $
  */
 
 #include <machine/stdarg.h>
@@ -68,8 +68,8 @@
 static ihandle_t stdin;
 static ihandle_t stdout;
 
-static ihandle_t mmu;
-static ihandle_t memory;
+ihandle_t mmu;
+ihandle_t memory;
 
 /* Initialiaser */
 

==== //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.h#6 (text+ko) ====

@@ -54,7 +54,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/ofw/libofw/openfirm.h,v 1.7 2002/02/23 03:36:04 jake Exp $
+ * $FreeBSD: src/sys/boot/ofw/libofw/openfirm.h,v 1.8 2002/07/18 12:39:02 benno Exp $
  */
 #ifndef _OPENFIRM_H_
 #define	_OPENFIRM_H_
@@ -71,6 +71,7 @@
 
 extern int		(*openfirmware)(void *);
 extern phandle_t	chosen;
+extern ihandle_t	memory, mmu;
 
 /*
  * This isn't actually an OpenFirmware function, but it seemed like the right

==== //depot/projects/smpng/sys/boot/pc98/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
-# $FreeBSD: src/sys/boot/pc98/Makefile,v 1.6 2002/01/18 09:00:37 nyan Exp $
+# $FreeBSD: src/sys/boot/pc98/Makefile,v 1.7 2002/07/18 14:50:41 nyan Exp $
 
-SUBDIR=		btx boot0 boot0.5 boot2 kgzldr libpc98 loader
+SUBDIR=		btx boot0 boot0.5 kgzldr libpc98 loader
 
 .include <bsd.subdir.mk>

==== //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#11 (text+ko) ====

@@ -1,5 +1,5 @@
 /* $NetBSD$	 */
-/* $FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.15 2002/04/09 20:10:40 jhb Exp $       */
+/* $FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.16 2002/07/20 02:56:09 peter Exp $       */
 
 /*
  * Copyright (c) 2000 Masaru OKI
@@ -465,7 +465,7 @@
 	    peofs + PECOFF_HDR_SIZE, (caddr_t) sh, scnsiz);
 	if ((error = exec_extract_strings(imgp)) != 0)
 		goto fail;
-	exec_new_vmspace(imgp);
+	exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, USRSTACK);
 	vmspace = imgp->proc->p_vmspace;
 	for (i = 0; i < fp->f_nscns; i++) {
 		prot = VM_PROT_WRITE;	/* XXX for relocation? */

==== //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#6 (text+ko) ====

@@ -29,7 +29,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/compat/svr4/imgact_svr4.c,v 1.15 2002/06/02 20:05:43 schweikh Exp $
+ * $FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.16 2002/07/20 02:56:09 peter Exp $
  */
 
 #include <sys/param.h>
@@ -119,7 +119,7 @@
     /*
      * Destroy old process VM and create a new one (with a new stack)
      */
-    exec_new_vmspace(imgp);
+    exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, USRSTACK);
     vmspace = imgp->proc->p_vmspace;
 
     /*

==== //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#8 (text+ko) ====

@@ -27,7 +27,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/compat/svr4/svr4_sysvec.c,v 1.25 2002/07/09 14:59:27 robert Exp $
+ * $FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.26 2002/07/20 02:56:09 peter Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -179,13 +179,14 @@
   &svr4_szsigcode,
   NULL,
   "SVR4",
-  elf_coredump,
+  elf32_coredump,
   NULL,
   SVR4_MINSIGSTKSZ
 };
 
 Elf32_Brandinfo svr4_brand = {
   ELFOSABI_SYSV,
+  EM_386,			/* XXX only implemented for x86 so far. */
   "SVR4",
   svr4_emul_path,
   "/lib/libc.so.1",
@@ -376,7 +377,7 @@
 
 	switch(type) {
 	case MOD_LOAD:
-		if (elf_insert_brand_entry(&svr4_brand) < 0)
+		if (elf32_insert_brand_entry(&svr4_brand) < 0)
 			error = EINVAL;
 		if (error)
 			printf("cannot insert svr4 elf brand handler\n");
@@ -385,9 +386,9 @@
 		break;
 	case MOD_UNLOAD:
 		/* Only allow the emulator to be removed if it isn't in use. */
-		if (elf_brand_inuse(&svr4_brand) != 0) {
+		if (elf32_brand_inuse(&svr4_brand) != 0) {
 			error = EBUSY;
-		} else if (elf_remove_brand_entry(&svr4_brand) < 0) {
+		} else if (elf32_remove_brand_entry(&svr4_brand) < 0) {
 			error = EINVAL;
 		}
 

==== //depot/projects/smpng/sys/conf/NOTES#19 (text+ko) ====

@@ -14,7 +14,7 @@
 # This file contains machine independent kernel configuration notes.  For
 # machine dependent notes, look in /sys/<arch>/conf/NOTES.
 #
-# $FreeBSD: src/sys/conf/NOTES,v 1.1057 2002/07/16 18:20:15 jhb Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1059 2002/07/21 23:20:29 peter Exp $
 #
 
 #
@@ -1557,7 +1557,7 @@
 
 # Order for ISA/EISA devices is important here
 
-device		ar	1
+device		ar
 hint.ar.0.at="isa"
 hint.ar.0.port="0x300"
 hint.ar.0.irq="10"
@@ -1578,16 +1578,16 @@
 hint.ed.0.maddr="0xd8000"
 device		ep
 device		ex
-device		fe	1
+device		fe
 hint.fe.0.at="isa"
 hint.fe.0.port="0x300"
 device		fea
-device		lnc	1
+device		lnc
 hint.lnc.0.at="isa"
 hint.lnc.0.port="0x280"
 hint.lnc.0.irq="10"
 hint.lnc.0.drq="0"
-device		sr	1
+device		sr
 hint.sr.0.at="isa"
 hint.sr.0.port="0x300"
 hint.sr.0.irq="5"
@@ -1602,7 +1602,7 @@
 device		wi
 options 	WLCACHE		# enables the signal-strength cache
 options 	WLDEBUG		# enables verbose debugging output
-device		wl	1
+device		wl
 hint.wl.0.at="isa"
 hint.wl.0.port="0x300"
 device		xe
@@ -1635,7 +1635,7 @@
 device		nge
 device		sk
 device		ti
-device		fpa	1
+device		fpa
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message