Re: CVS: cvs.openbsd.org: src

[Niklas Hallqvist <niklas_(_at_)_appli_(_dot_)_se>]

Oops, there also was one non-trunk change in here.

sys/systm.h
kern/init_main.c
kern/kern_sysctl.c

Add a ncpus variable, defaulting to 1.

> Date: Sun, 20 Feb 2000 04:57:34 -0700 (MST)
> From: Niklas Hallqvist <niklas_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org>
> 
> CVSROOT:	/cvs
> Module name:	src
> Changes by:	niklas_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org	2000/02/20 04:57:34
> 
> Modified files:
> 	sys/arch/i386/i386: Tag: SMP bios.c 
> 	sys/arch/i386/include: Tag: SMP biosvar.h 
> 	sys/arch/i386/stand/libsa: Tag: SMP exec_i386.c 
> 	sys/arch/sparc/include: Tag: SMP ctlreg.h param.h 
> 	sys/arch/sparc/sparc: Tag: SMP asm.h cache.c cache.h cpu.c 
> 	                      cpuvar.h genassym.cf kgdb_machdep.c 
> 	                      locore.s machdep.c pmap.c vm_machdep.c 
> 	sys/arch/sparc/stand: Tag: SMP Makefile.inc 
> 	sys/arch/sparc/stand/boot: Tag: SMP Makefile 
> 	sys/dev/ic     : Tag: SMP adw.c adwlib.c 
> 	sys/dev/mii    : Tag: SMP exphy.c miidevs miidevs.h 
> 	sys/dev/pci    : Tag: SMP adw_pci.c if_al.c if_ax.c if_dc.c 
> 	                 if_rl.c if_sf.c if_sis.c if_sk.c if_ste.c 
> 	                 if_ti.c if_tireg.h if_tl.c if_vr.c if_wb.c 
> 	                 if_xl.c pcidevs pcidevs.h pcidevs_data.h 
> 	                 ti_fw.h ti_fw2.h 
> 	sys/kern       : Tag: SMP init_main.c kern_sysctl.c 
> 	                 subr_extent.c uipc_socket2.c 
> 	sys/net        : Tag: SMP bpf.c if_bridge.c if_media.h rtsock.c 
> 	sys/netinet    : Tag: SMP fil.c ip_auth.c ip_auth.h ip_fil.c 
> 	                 ip_fil.h ip_fil_compat.h ip_frag.c ip_frag.h 
> 	                 ip_ftp_pxy.c ip_log.c ip_nat.c ip_nat.h 
> 	                 ip_proxy.c ip_proxy.h ip_raudio_pxy.c 
> 	                 ip_rcmd_pxy.c ip_state.c ip_state.h ipl.h 
> 	                 udp_usrreq.c 
> 	sys/netinet6   : Tag: SMP in6.h 
> 	sys/sys        : Tag: SMP extent.h socket.h systm.h 
> 
> Log message:
> Merge in recent code from the trunk
>