Date: Fri, 4 Apr 2003 11:52:58 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 28076 for review Message-ID: <200304041952.h34JqwhU040834@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=28076 Change 28076 by jhb@jhb_laptop on 2003/04/04 11:52:51 IFC @28074. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/support.s#6 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/bootinfo.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/srmdisk.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/arcdisk.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/bootinfo.c#2 integrate .. //depot/projects/smpng/sys/boot/common/commands.c#3 integrate .. //depot/projects/smpng/sys/boot/common/load_elf.c#7 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/copy.c#4 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/delay.c#2 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/efi_console.c#3 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/libefi.c#4 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/module.c#2 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/time.c#3 integrate .. //depot/projects/smpng/sys/boot/efi/loader/conf.c#8 integrate .. //depot/projects/smpng/sys/boot/efi/loader/main.c#10 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#17 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/bioscd.c#4 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#7 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/elf_freebsd.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/copy.c#3 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/delay.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/exit.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/module.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/skiconsole.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/time.c#3 integrate .. //depot/projects/smpng/sys/boot/ia64/skiload/conf.c#3 integrate .. //depot/projects/smpng/sys/boot/ia64/skiload/main.c#3 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/disk.c#5 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/sys.c#3 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/biosdisk.c#7 integrate .. //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#5 integrate .. //depot/projects/smpng/sys/conf/files#69 integrate .. //depot/projects/smpng/sys/conf/options.i386#24 integrate .. //depot/projects/smpng/sys/conf/options.pc98#26 integrate .. //depot/projects/smpng/sys/ddb/db_input.c#5 integrate .. //depot/projects/smpng/sys/dev/adlink/adlink.c#1 branch .. //depot/projects/smpng/sys/dev/an/if_an.c#28 integrate .. //depot/projects/smpng/sys/dev/an/if_an_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pccard.c#7 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#19 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#21 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#13 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#13 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#26 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpreg.h#5 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#8 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#11 integrate .. //depot/projects/smpng/sys/dev/md/md.c#33 integrate .. //depot/projects/smpng/sys/dev/mii/acphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/amphy.c#8 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#13 integrate .. //depot/projects/smpng/sys/dev/mii/dcphy.c#8 integrate .. //depot/projects/smpng/sys/dev/mii/exphy.c#8 integrate .. //depot/projects/smpng/sys/dev/mii/lxtphy.c#8 integrate .. //depot/projects/smpng/sys/dev/mii/mii.c#7 integrate .. //depot/projects/smpng/sys/dev/mii/mii_physubr.c#6 integrate .. //depot/projects/smpng/sys/dev/mii/nsgphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/nsphy.c#8 integrate .. //depot/projects/smpng/sys/dev/mii/pnaphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/pnphy.c#7 integrate .. //depot/projects/smpng/sys/dev/mii/qsphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/rlphy.c#11 integrate .. //depot/projects/smpng/sys/dev/mii/tdkphy.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/tlphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/ukphy.c#6 integrate .. //depot/projects/smpng/sys/dev/mii/ukphy_subr.c#3 integrate .. //depot/projects/smpng/sys/dev/mii/xmphy.c#9 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#9 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#21 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#12 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#5 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#18 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#15 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/if_kue.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#7 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#48 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#12 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.c#8 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#9 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_lock.c#8 integrate .. //depot/projects/smpng/sys/geom/geom.h#23 integrate .. //depot/projects/smpng/sys/geom/geom_aes.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_apple.c#3 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#24 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#7 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_disk.h#2 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#16 integrate .. //depot/projects/smpng/sys/geom/geom_enc.c#7 delete .. //depot/projects/smpng/sys/geom/geom_event.c#14 integrate .. //depot/projects/smpng/sys/geom/geom_int.h#10 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#17 integrate .. //depot/projects/smpng/sys/geom/geom_kern.c#13 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#17 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#15 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#16 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#18 integrate .. //depot/projects/smpng/sys/i386/i386/locore.s#16 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#56 integrate .. //depot/projects/smpng/sys/i386/i386/mem.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#44 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#35 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#10 integrate .. //depot/projects/smpng/sys/i386/i386/swtch.s#16 integrate .. //depot/projects/smpng/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/smpng/sys/i386/include/md_var.h#19 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#14 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#10 integrate .. //depot/projects/smpng/sys/i386/isa/apic_vector.s#15 integrate .. //depot/projects/smpng/sys/i386/isa/intr_machdep.h#12 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#33 integrate .. //depot/projects/smpng/sys/ia64/ia64/support.s#10 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#22 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#4 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#21 integrate .. //depot/projects/smpng/sys/kern/subr_disk.c#18 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#96 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#36 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#40 integrate .. //depot/projects/smpng/sys/net/slcompress.c#3 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_kxdr.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#9 integrate .. //depot/projects/smpng/sys/netinet/in.h#20 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#19 integrate .. //depot/projects/smpng/sys/netinet/ip.h#6 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#31 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#34 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#12 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_mbuf.c#6 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_output.c#5 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#50 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#12 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#29 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#12 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#14 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#20 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#13 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#16 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#22 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#11 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#12 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#12 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/autoconf.c#9 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/bcopy.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/busdma_machdep.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/clock.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/copyinout.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/copystr.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/extintr.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/fpu.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/fuswintr.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#35 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/ofw_machdep.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#26 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/suswintr.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/syncicache.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/sys_machdep.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#32 integrate .. //depot/projects/smpng/sys/sparc64/include/cpufunc.h#16 integrate .. //depot/projects/smpng/sys/sparc64/include/pcb.h#11 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#28 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#45 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#16 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/support.S#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/swtch.S#4 integrate .. //depot/projects/smpng/sys/sys/bio.h#14 integrate .. //depot/projects/smpng/sys/sys/disklabel.h#23 integrate .. //depot/projects/smpng/sys/sys/diskmbr.h#4 integrate .. //depot/projects/smpng/sys/sys/diskslice.h#6 delete .. //depot/projects/smpng/sys/sys/endian.h#2 integrate .. //depot/projects/smpng/sys/sys/proc.h#76 integrate .. //depot/projects/smpng/sys/sys/reboot.h#4 integrate .. //depot/projects/smpng/sys/sys/systm.h#41 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#10 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/support.s#6 (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/alpha/alpha/support.s,v 1.12 2002/06/20 07:40:53 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.13 2003/04/04 17:29:54 des Exp $ */ /* @@ -270,16 +270,11 @@ /* * Copy a bytes within the kernel's address space. + * Handles overlapping regions. * - * In the kernel, bcopy() doesn't have to handle the overlapping - * case; that's that ovbcopy() is for. However, it doesn't hurt - * to do both in bcopy, and it does provide a measure of safety. - * * void bcopy(char *from, char *to, size_t len); - * void ovbcopy(char *from, char *to, size_t len); */ LEAF(bcopy,3) -XLEAF(ovbcopy,3) /* Check for negative length */ ble a2,bcopy_done ==== //depot/projects/smpng/sys/boot/alpha/libalpha/bootinfo.c#2 (text+ko) ==== @@ -23,13 +23,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/alpha/libalpha/bootinfo.c,v 1.12 2001/02/18 10:25:36 asmodai Exp $ + * $FreeBSD: src/sys/boot/alpha/libalpha/bootinfo.c,v 1.13 2003/04/04 16:35:14 phk Exp $ */ #include <stand.h> #include <string.h> #include <sys/param.h> -#include <sys/reboot.h> #include <sys/linker.h> #include <machine/elf.h> #include <machine/prom.h> ==== //depot/projects/smpng/sys/boot/alpha/libalpha/srmdisk.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/alpha/libalpha/srmdisk.c,v 1.11 2001/04/05 20:45:25 obrien Exp $ + * $FreeBSD: src/sys/boot/alpha/libalpha/srmdisk.c,v 1.12 2003/04/04 16:35:14 phk Exp $ */ /* @@ -40,7 +40,6 @@ #include <stand.h> #include <sys/disklabel.h> -#include <sys/diskslice.h> #include <machine/stdarg.h> #include <machine/prom.h> ==== //depot/projects/smpng/sys/boot/arc/lib/arcdisk.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/arc/lib/arcdisk.c,v 1.4 2000/08/04 05:25:36 jhb Exp $ + * $FreeBSD: src/sys/boot/arc/lib/arcdisk.c,v 1.5 2003/04/04 16:35:14 phk Exp $ */ /* @@ -40,7 +40,6 @@ #include <stand.h> #include <sys/disklabel.h> -#include <sys/diskslice.h> #include <machine/stdarg.h> ==== //depot/projects/smpng/sys/boot/arc/lib/bootinfo.c#2 (text+ko) ==== @@ -23,13 +23,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/arc/lib/bootinfo.c,v 1.4 2001/02/18 10:25:41 asmodai Exp $ + * $FreeBSD: src/sys/boot/arc/lib/bootinfo.c,v 1.5 2003/04/04 16:35:14 phk Exp $ */ #include <stand.h> #include <string.h> #include <sys/param.h> -#include <sys/reboot.h> #include <sys/linker.h> #include <machine/elf.h> #include <machine/prom.h> ==== //depot/projects/smpng/sys/boot/common/commands.c#3 (text+ko) ==== @@ -23,12 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/commands.c,v 1.17 2001/11/04 02:58:39 jhb Exp $ + * $FreeBSD: src/sys/boot/common/commands.c,v 1.18 2003/04/04 16:35:14 phk Exp $ */ #include <stand.h> #include <string.h> -#include <sys/reboot.h> #include "bootstrap.h" ==== //depot/projects/smpng/sys/boot/common/load_elf.c#7 (text+ko) ==== @@ -24,12 +24,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.25 2003/01/21 05:46:46 jake Exp $ + * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.26 2003/04/04 16:35:14 phk Exp $ */ #include <sys/param.h> #include <sys/exec.h> -#include <sys/reboot.h> #include <sys/linker.h> #include <sys/module.h> #include <string.h> ==== //depot/projects/smpng/sys/boot/efi/libefi/copy.c#4 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/libefi/copy.c,v 1.4 2002/05/19 04:42:18 marcel Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/copy.c,v 1.5 2003/04/03 21:36:29 obrien Exp $"); /* * MD primitives supporting placement of module data ==== //depot/projects/smpng/sys/boot/efi/libefi/delay.c#2 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/libefi/delay.c,v 1.2 2001/06/16 02:12:36 obrien Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/delay.c,v 1.3 2003/04/03 21:36:29 obrien Exp $"); #include <efi.h> #include <efilib.h> ==== //depot/projects/smpng/sys/boot/efi/libefi/efi_console.c#3 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/libefi/efi_console.c,v 1.3 2002/12/08 19:46:11 marcel Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/efi_console.c,v 1.4 2003/04/03 21:36:29 obrien Exp $"); #include <efi.h> #include <efilib.h> ==== //depot/projects/smpng/sys/boot/efi/libefi/libefi.c#4 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/libefi/libefi.c,v 1.5 2003/03/01 05:13:59 marcel Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/libefi.c,v 1.6 2003/04/03 21:36:29 obrien Exp $"); #include <efi.h> #include <efilib.h> ==== //depot/projects/smpng/sys/boot/efi/libefi/module.c#2 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/libefi/module.c,v 1.2 2001/06/16 02:12:36 obrien Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/module.c,v 1.3 2003/04/03 21:36:29 obrien Exp $"); #include <stand.h> ==== //depot/projects/smpng/sys/boot/efi/libefi/time.c#3 (text+ko) ==== @@ -38,10 +38,8 @@ * */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/libefi/time.c,v 1.3 2001/09/22 18:33:09 dfr Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/time.c,v 1.4 2003/04/03 21:36:29 obrien Exp $"); #include <efi.h> #include <efilib.h> ==== //depot/projects/smpng/sys/boot/efi/loader/conf.c#8 (text+ko) ==== @@ -31,10 +31,8 @@ * $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $ */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.8 2002/12/19 19:34:58 jake Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.9 2003/04/03 21:36:29 obrien Exp $"); #include <stand.h> #include <efi.h> ==== //depot/projects/smpng/sys/boot/efi/loader/main.c#10 (text+ko) ==== @@ -25,10 +25,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.18 2003/03/01 05:18:28 marcel Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.19 2003/04/03 21:36:29 obrien Exp $"); #include <stand.h> #include <string.h> ==== //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#17 (text+ko) ==== @@ -14,12 +14,10 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.62 2003/01/14 16:33:37 imp Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.63 2003/04/04 16:35:14 phk Exp $ */ #include <sys/param.h> -#include <sys/reboot.h> -#include <sys/diskslice.h> #include <sys/disklabel.h> #include <sys/diskmbr.h> #include <sys/dirent.h> ==== //depot/projects/smpng/sys/boot/i386/libi386/bioscd.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/bioscd.c,v 1.3 2002/05/15 11:32:53 jhay Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/bioscd.c,v 1.4 2003/04/04 16:35:14 phk Exp $ */ /* @@ -40,7 +40,7 @@ #include <stand.h> #include <sys/param.h> -#include <sys/reboot.h> +#include <machine/bootinfo.h> #include <machine/psl.h> #include <stdarg.h> ==== //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#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/boot/i386/libi386/biosdisk.c,v 1.38 2003/01/20 11:15:12 phk Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.39 2003/04/04 16:35:14 phk Exp $ */ /* @@ -40,7 +40,7 @@ #include <sys/disklabel.h> #include <sys/diskmbr.h> -#include <sys/reboot.h> +#include <machine/bootinfo.h> #include <stdarg.h> ==== //depot/projects/smpng/sys/boot/i386/libi386/elf_freebsd.c#2 (text+ko) ==== @@ -23,12 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/elf_freebsd.c,v 1.10 2000/08/03 09:14:01 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/elf_freebsd.c,v 1.11 2003/04/04 16:35:15 phk Exp $ */ #include <sys/param.h> #include <sys/exec.h> -#include <sys/reboot.h> #include <sys/linker.h> #include <string.h> #include <machine/bootinfo.h> ==== //depot/projects/smpng/sys/boot/ia64/libski/copy.c#3 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/libski/copy.c,v 1.2 2002/05/19 04:42:18 marcel Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/copy.c,v 1.3 2003/04/03 21:36:29 obrien Exp $"); /* * MD primitives supporting placement of module data ==== //depot/projects/smpng/sys/boot/ia64/libski/delay.c#2 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/libski/delay.c,v 1.1 2001/09/12 08:34:26 dfr Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/delay.c,v 1.2 2003/04/03 21:36:29 obrien Exp $"); void delay(int usecs) ==== //depot/projects/smpng/sys/boot/ia64/libski/exit.c#2 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/libski/exit.c,v 1.1 2001/09/12 08:34:26 dfr Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/exit.c,v 1.2 2003/04/03 21:36:29 obrien Exp $"); #include <sys/param.h> #include <sys/time.h> ==== //depot/projects/smpng/sys/boot/ia64/libski/module.c#2 (text+ko) ==== @@ -24,10 +24,9 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/libski/module.c,v 1.1 2001/09/12 08:34:27 dfr Exp $"; -#endif /* not lint */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/module.c,v 1.2 2003/04/03 21:36:29 obrien Exp $"); #include <stand.h> ==== //depot/projects/smpng/sys/boot/ia64/libski/skiconsole.c#2 (text+ko) ==== @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/libski/skiconsole.c,v 1.1 2001/09/12 08:34:27 dfr Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/skiconsole.c,v 1.2 2003/04/03 21:36:29 obrien Exp $"); #include <stand.h> ==== //depot/projects/smpng/sys/boot/ia64/libski/time.c#3 (text+ko) ==== @@ -38,10 +38,8 @@ * */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/libski/time.c,v 1.2 2001/09/19 12:12:12 dfr Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/time.c,v 1.3 2003/04/03 21:36:29 obrien Exp $"); #include <time.h> #include <sys/time.h> ==== //depot/projects/smpng/sys/boot/ia64/skiload/conf.c#3 (text+ko) ==== @@ -31,10 +31,8 @@ * $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $ */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/skiload/conf.c,v 1.2 2002/12/19 19:34:59 jake Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/ia64/skiload/conf.c,v 1.4 2003/04/04 02:12:56 marcel Exp $"); #include <stand.h> ==== //depot/projects/smpng/sys/boot/ia64/skiload/main.c#3 (text+ko) ==== @@ -25,10 +25,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/skiload/main.c,v 1.2 2002/09/23 05:55:10 peter Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/ia64/skiload/main.c,v 1.3 2003/04/03 21:36:29 obrien Exp $"); #include <stand.h> #include <string.h> ==== //depot/projects/smpng/sys/boot/pc98/boot2/disk.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:49 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/disk.c,v 1.8 2003/01/06 13:43:13 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/disk.c,v 1.9 2003/04/04 16:35:15 phk Exp $ */ /* @@ -43,8 +43,8 @@ #include "boot.h" #include <sys/disklabel.h> -#include <sys/diskslice.h> #include <sys/diskpc98.h> +#include <machine/bootinfo.h> #define BIOS_DEV_FLOPPY 0x0 #define BIOS_DEV_WIN 0x80 ==== //depot/projects/smpng/sys/boot/pc98/boot2/sys.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:34 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.3 2003/01/06 13:43:14 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.4 2003/04/04 16:35:15 phk Exp $ */ /* @@ -33,7 +33,6 @@ #include "boot.h" #include <sys/dirent.h> -#include <sys/reboot.h> #if 0 /* #define BUFSIZE 4096 */ ==== //depot/projects/smpng/sys/boot/pc98/libpc98/biosdisk.c#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/boot/pc98/libpc98/biosdisk.c,v 1.23 2003/01/21 13:59:53 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.24 2003/04/04 16:35:15 phk Exp $ */ /* @@ -39,9 +39,8 @@ #include <stand.h> #include <sys/disklabel.h> -#include <sys/diskslice.h> #include <sys/diskpc98.h> -#include <sys/reboot.h> +#include <machine/bootinfo.h> #include <stdarg.h> ==== //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#5 (text+ko) ==== @@ -17,11 +17,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/sparc64/boot1/boot1.c,v 1.14 2002/06/05 12:12:25 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/boot1/boot1.c,v 1.15 2003/04/04 16:35:15 phk Exp $"); #include <sys/param.h> -#include <sys/reboot.h> -#include <sys/diskslice.h> #include <sys/disklabel.h> #include <sys/dirent.h> #include <machine/elf.h> ==== //depot/projects/smpng/sys/conf/files#69 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.775 2003/04/01 01:13:29 jeff Exp $ +# $FreeBSD: src/sys/conf/files,v 1.777 2003/04/04 18:53:04 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -255,6 +255,7 @@ dev/acpica/Osd/OsdStream.c optional acpi dev/acpica/Osd/OsdSynch.c optional acpi dev/acpica/Osd/OsdTable.c optional acpi +dev/adlink/adlink.c optional adlink dev/advansys/adv_eisa.c optional adv eisa dev/advansys/adv_pci.c optional adv pci dev/advansys/advansys.c optional adv @@ -889,7 +890,6 @@ geom/geom_dev.c standard geom/geom_disk.c standard geom/geom_dump.c standard -geom/geom_enc.c standard geom/geom_event.c standard geom/geom_gpt.c optional geom_gpt geom/geom_io.c standard ==== //depot/projects/smpng/sys/conf/options.i386#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.187 2003/03/30 05:24:51 jake Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.188 2003/04/02 23:53:28 peter Exp $ # Options specific to the i386 platform kernels MATH_EMULATE opt_math_emulate.h @@ -6,6 +6,8 @@ DISABLE_PSE opt_pmap.h PMAP_SHPGPERPROC opt_pmap.h DISABLE_PG_G opt_pmap.h +LAZY_SWITCH opt_swtch.h +SWTCH_OPTIM_STATS opt_swtch.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h MAXMEM ==== //depot/projects/smpng/sys/conf/options.pc98#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.160 2003/03/26 19:49:33 ps Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.161 2003/04/03 12:39:51 nyan Exp $ # Options specific to the pc98 platform kernels MATH_EMULATE opt_math_emulate.h @@ -6,6 +6,8 @@ DISABLE_PSE opt_pmap.h PMAP_SHPGPERPROC opt_pmap.h DISABLE_PG_G opt_pmap.h +LAZY_SWITCH opt_swtch.h +SWTCH_OPTIM_STATS opt_swtch.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h MAXMEM ==== //depot/projects/smpng/sys/ddb/db_input.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/ddb/db_input.c,v 1.32 2002/09/28 17:14:19 phk Exp $ + * $FreeBSD: src/sys/ddb/db_input.c,v 1.33 2003/04/04 12:10:04 des Exp $ */ /* @@ -329,8 +329,8 @@ /* Maintain input line history for non-empty lines. */ if (++db_lhistidx == db_lhist_nlines) { /* Rotate history. */ - ovbcopy(db_lhistory + db_lhistlsize, db_lhistory, - db_lhistlsize * (db_lhist_nlines - 1)); + bcopy(db_lhistory + db_lhistlsize, db_lhistory, + db_lhistlsize * (db_lhist_nlines - 1)); db_lhistidx--; } bcopy(lstart, db_lhistory + db_lhistidx * db_lhistlsize, ==== //depot/projects/smpng/sys/dev/an/if_an.c#28 (text+ko) ==== @@ -28,8 +28,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (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/an/if_an.c,v 1.47 2003/02/19 05:47:00 imp Exp $ */ /* @@ -81,6 +79,9 @@ * driver handles all of the encapsulation/decapsulation itself. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.48 2003/04/03 21:36:29 obrien Exp $"); + #include "opt_inet.h" #ifdef INET @@ -132,11 +133,6 @@ #include <dev/an/if_aironet_ieee.h> #include <dev/an/if_anreg.h> -#if !defined(lint) -static const char rcsid[] = - "$FreeBSD: src/sys/dev/an/if_an.c,v 1.47 2003/02/19 05:47:00 imp Exp $"; -#endif - /* These are global because we need them in sys/pci/if_an_p.c. */ static void an_reset (struct an_softc *); static int an_init_mpi350_desc (struct an_softc *); ==== //depot/projects/smpng/sys/dev/an/if_an_isa.c#6 (text+ko) ==== @@ -28,8 +28,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (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/an/if_an_isa.c,v 1.9 2003/02/17 19:57:32 imp Exp $ */ /* @@ -40,7 +38,11 @@ * Columbia University, New York City */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.10 2003/04/03 21:36:30 obrien Exp $"); + #include "opt_inet.h" + #ifdef INET #define ANCACHE #endif @@ -71,11 +73,6 @@ #include <dev/an/if_aironet_ieee.h> #include <dev/an/if_anreg.h> -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.9 2003/02/17 19:57:32 imp Exp $"; -#endif - static struct isa_pnp_id an_ids[] = { { 0x0100ec06, "Aironet ISA4500/ISA4800" }, { 0, NULL } ==== //depot/projects/smpng/sys/dev/an/if_an_pccard.c#7 (text+ko) ==== @@ -28,8 +28,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (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/an/if_an_pccard.c,v 1.16 2003/02/17 19:57:32 imp Exp $ */ /* @@ -40,6 +38,9 @@ * Columbia University, New York City */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.17 2003/04/03 21:36:30 obrien Exp $"); + #include "opt_inet.h" #ifdef INET @@ -70,11 +71,6 @@ #include <dev/pccard/pccarddevs.h> #include "card_if.h" -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.16 2003/02/17 19:57:32 imp Exp $"; -#endif - #include <dev/an/if_aironet_ieee.h> #include <dev/an/if_anreg.h> ==== //depot/projects/smpng/sys/dev/an/if_an_pci.c#10 (text+ko) ==== @@ -28,8 +28,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (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/an/if_an_pci.c,v 1.17 2003/02/17 19:57:32 imp Exp $ */ /* @@ -52,6 +50,9 @@ * to go through their sales office to get it. Bleh. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.18 2003/04/03 21:36:30 obrien Exp $"); + #include "opt_inet.h" #ifdef INET @@ -82,11 +83,6 @@ #include <pci/pcireg.h> #include <pci/pcivar.h> -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.17 2003/02/17 19:57:32 imp Exp $"; -#endif - #include <dev/an/if_aironet_ieee.h> #include <dev/an/if_anreg.h> ==== //depot/projects/smpng/sys/dev/ata/atapi-tape.c#19 (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/ata/atapi-tape.c,v 1.78 2003/04/01 15:06:23 phk Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.79 2003/04/03 08:50:35 phk Exp $ */ #include "opt_ata.h" @@ -38,7 +38,6 @@ #include <sys/bio.h> #include <sys/bus.h> #include <sys/mtio.h> -#include <sys/disklabel.h> #include <sys/devicestat.h> #include <machine/bus.h> #include <dev/ata/ata-all.h> @@ -125,12 +124,12 @@ DEVSTAT_NO_ORDERED_TAGS, DEVSTAT_TYPE_SEQUENTIAL | DEVSTAT_TYPE_IF_IDE, DEVSTAT_PRIORITY_TAPE); - dev = make_dev(&ast_cdevsw, dkmakeminor(stp->lun, 0, 0), + dev = make_dev(&ast_cdevsw, 2 * stp->lun, UID_ROOT, GID_OPERATOR, 0640, "ast%d", stp->lun); dev->si_drv1 = stp; dev->si_iosize_max = 256 * DEV_BSIZE; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304041952.h34JqwhU040834>