Date: Tue, 6 Jan 2004 11:47:41 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 44872 for review Message-ID: <200401061947.i06JlfNw082489@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=44872 Change 44872 by jhb@jhb_blue on 2004/01/06 11:46:46 IFC @44869. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/db_instruction.h#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/db_trace.c#9 integrate .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#65 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#23 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#19 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#8 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/smpng/sys/amd64/isa/icu.h#3 integrate .. //depot/projects/smpng/sys/boot/alpha/common/conf.c#3 integrate .. //depot/projects/smpng/sys/boot/alpha/common/main.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/OSFpal.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/alpha_copy.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/alpha_module.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/bootinfo.c#3 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/delay.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/devicename.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/elf_freebsd.c#3 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/getsecs.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/prom.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/reboot.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/srmdisk.c#3 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/srmnet.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/time.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/abort.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/arcconsole.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/arcdisk.c#4 integrate .. //depot/projects/smpng/sys/boot/arc/lib/bootinfo.c#3 integrate .. //depot/projects/smpng/sys/boot/arc/lib/delay.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/devicename.c#3 integrate .. //depot/projects/smpng/sys/boot/arc/lib/elf_freebsd.c#3 integrate .. //depot/projects/smpng/sys/boot/arc/lib/module.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/prom.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/setjmperr.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/time.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/loader/conf.c#3 integrate .. //depot/projects/smpng/sys/boot/arc/loader/main.c#2 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/bootinfo.c#8 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/devicename.c#3 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/efifpswa.c#2 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/efinet.c#4 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/elf_freebsd.c#11 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0sio.s#2 integrate .. //depot/projects/smpng/sys/boot/ofw/common/main.c#5 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/devicename.c#8 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/elf_freebsd.c#7 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_console.c#3 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_copy.c#5 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#9 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_memory.c#4 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_module.c#2 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_net.c#6 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_reboot.c#2 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_time.c#3 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.c#7 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/conf.c#5 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/metadata.c#4 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/start.c#4 integrate .. //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#7 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#16 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/metadata.c#11 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/smpng/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_pe.c#3 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#30 integrate .. //depot/projects/smpng/sys/conf/options.pc98#36 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#23 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/drm_bufs.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.h#14 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sysctl.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/mga_dma.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drv.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/r128.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/r128_cce.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drv.h#7 integrate .. //depot/projects/smpng/sys/dev/drm/radeon.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#9 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#8 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#28 integrate .. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#15 integrate .. //depot/projects/smpng/sys/dev/firewire/fwmem.c#15 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#27 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#22 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcireg.h#11 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcivar.h#8 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#19 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#30 integrate .. //depot/projects/smpng/sys/dev/ic/i8259.h#1 branch .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#39 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbdevid.h#11 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#32 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#43 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#43 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#43 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/uvisor.c#9 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#13 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#13 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#72 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#71 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#47 integrate .. //depot/projects/smpng/sys/i386/include/elan_mmcr.h#1 branch .. //depot/projects/smpng/sys/i386/include/md_var.h#24 integrate .. //depot/projects/smpng/sys/i386/include/profile.h#8 integrate .. //depot/projects/smpng/sys/i386/isa/atpic.c#4 integrate .. //depot/projects/smpng/sys/i386/isa/icu.h#9 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#37 integrate .. //depot/projects/smpng/sys/i386/svr4/svr4_machdep.c#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#77 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#68 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#74 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#80 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#66 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#24 integrate .. //depot/projects/smpng/sys/net/if_vlan_var.h#10 integrate .. //depot/projects/smpng/sys/netsmb/smb_conn.c#9 integrate .. //depot/projects/smpng/sys/netsmb/smb_conn.h#8 integrate .. //depot/projects/smpng/sys/netsmb/smb_crypt.c#5 integrate .. //depot/projects/smpng/sys/netsmb/smb_iod.c#13 integrate .. //depot/projects/smpng/sys/netsmb/smb_rq.c#12 integrate .. //depot/projects/smpng/sys/netsmb/smb_rq.h#3 integrate .. //depot/projects/smpng/sys/netsmb/smb_smb.c#9 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.h#13 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#18 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#63 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#46 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#61 integrate .. //depot/projects/smpng/sys/sys/proc.h#108 integrate .. //depot/projects/smpng/sys/sys/vnode.h#41 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#34 integrate .. //depot/projects/smpng/sys/vm/device_pager.c#13 integrate .. //depot/projects/smpng/sys/vm/phys_pager.c#11 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#38 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#38 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/db_instruction.h#3 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.5 2002/04/13 22:21:28 obrien Exp $ */ /* $NetBSD: db_instruction.h,v 1.4 1997/09/16 22:53:32 thorpej Exp $ */ /* @@ -25,6 +24,8 @@ * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. + * + * $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.6 2004/01/04 23:30:47 obrien Exp $ */ /* ==== //depot/projects/smpng/sys/alpha/alpha/db_trace.c#9 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.17 2003/12/23 02:36:41 peter Exp $ */ /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */ /*- @@ -42,8 +41,8 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ - /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.18 2004/01/04 23:30:47 obrien Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#65 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.215 2003/11/14 04:04:14 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.216 2004/01/03 02:02:24 davidxu Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1163,12 +1163,12 @@ * will fail if the process has not already allocated * the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sip = (osiginfo_t *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); + sip = (osiginfo_t *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize); @@ -1263,8 +1263,8 @@ /* save user context */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack = p->p_sigstk; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack = td->td_sigstk; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; @@ -1287,12 +1287,12 @@ * will fail if the process has not already allocated * the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct sigframe4 *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); + sfp = (struct sigframe4 *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sfp = (struct sigframe4 *)(alpha_pal_rdusp() - rndfsize); @@ -1386,8 +1386,8 @@ /* save user context */ bzero(&sf, sizeof(struct sigframe)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack = p->p_sigstk; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack = td->td_sigstk; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; @@ -1411,12 +1411,12 @@ * will fail if the process has not already allocated * the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct sigframe *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); + sfp = (struct sigframe *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sfp = (struct sigframe *)(alpha_pal_rdusp() - rndfsize); @@ -1535,9 +1535,9 @@ * Restore the user-supplied information */ if (ksc.sc_onstack) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif /* @@ -1622,9 +1622,9 @@ PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) if (uc.uc_mcontext.mc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif td->td_sigmask = uc.uc_sigmask; @@ -1698,9 +1698,9 @@ PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) if (uc.uc_mcontext.mc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif td->td_sigmask = uc.uc_sigmask; ==== //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#23 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.35 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.36 2004/01/03 23:36:31 davidxu Exp $"); #include "opt_compat.h" #ifndef COMPAT_43 @@ -485,11 +485,11 @@ * and the useracc() check will fail if the process has not already * allocated the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sip = (osiginfo_t *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); - p->p_sigstk.ss_flags |= SS_ONSTACK; + sip = (osiginfo_t *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); + td->td_sigstk.ss_flags |= SS_ONSTACK; } else sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize); mtx_unlock(&psp->ps_mtx); @@ -588,9 +588,9 @@ */ PROC_LOCK(p); if (ksc.sc_onstack) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; /* * longjmp is still implemented by calling osigreturn. The new ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#19 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.601 2003/12/06 23:19:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.602 2004/01/03 02:02:24 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -246,8 +246,8 @@ /* Save user context. */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack = p->p_sigstk; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack = td->td_sigstk; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; bcopy(regs, &sf.sf_uc.uc_mcontext.mc_rdi, sizeof(*regs)); @@ -256,12 +256,12 @@ fpstate_drop(td); /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sp = p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(struct sigframe); + sp = td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(struct sigframe); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sp = (char *)regs->tf_rsp - sizeof(struct sigframe) - 128; @@ -403,9 +403,9 @@ PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) if (ucp->uc_mcontext.mc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif td->td_sigmask = ucp->uc_sigmask; ==== //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.7 2003/12/03 07:00:30 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.8 2004/01/03 02:02:24 davidxu Exp $"); #include "opt_compat.h" @@ -194,9 +194,9 @@ /* Save user context. */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack.ss_sp = (uintptr_t)p->p_sigstk.ss_sp; - sf.sf_uc.uc_stack.ss_size = p->p_sigstk.ss_size; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack.ss_sp = (uintptr_t)td->td_sigstk.ss_sp; + sf.sf_uc.uc_stack.ss_size = td->td_sigstk.ss_size; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; sf.sf_uc.uc_mcontext.mc_gs = rgs(); @@ -220,10 +220,10 @@ sf.sf_uc.uc_mcontext.mc_ss = regs->tf_ss; /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct ia32_sigframe4 *)(p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(sf)); + sfp = (struct ia32_sigframe4 *)(td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(sf)); } else sfp = (struct ia32_sigframe4 *)regs->tf_rsp - 1; PROC_UNLOCK(p); @@ -308,9 +308,9 @@ /* Save user context. */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack.ss_sp = (uintptr_t)p->p_sigstk.ss_sp; - sf.sf_uc.uc_stack.ss_size = p->p_sigstk.ss_size; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack.ss_sp = (uintptr_t)td->td_sigstk.ss_sp; + sf.sf_uc.uc_stack.ss_size = td->td_sigstk.ss_size; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; sf.sf_uc.uc_mcontext.mc_gs = rgs(); @@ -337,10 +337,10 @@ fpstate_drop(td); /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sp = p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(sf); + sp = td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(sf); } else sp = (char *)regs->tf_rsp - sizeof(sf); /* Align to 16 bytes. */ ==== //depot/projects/smpng/sys/amd64/isa/atpic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.7 2003/11/21 02:58:26 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.8 2004/01/06 19:05:25 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -53,6 +53,7 @@ #include <machine/resource.h> #include <machine/segments.h> +#include <dev/ic/i8259.h> #include <amd64/isa/icu.h> #include <amd64/isa/isa.h> ==== //depot/projects/smpng/sys/amd64/isa/icu.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.31 2003/11/17 09:19:12 peter Exp $ + * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.32 2004/01/06 19:05:25 jhb Exp $ */ /* @@ -42,8 +42,8 @@ * W. Jolitz 8/89 */ -#ifndef _I386_ISA_ICU_H_ -#define _I386_ISA_ICU_H_ +#ifndef _AMD64_ISA_ICU_H_ +#define _AMD64_ISA_ICU_H_ /* * Interrupt enable bits - in normal order of priority (which we change) @@ -66,57 +66,7 @@ #define IRQ6 0x0040 #define IRQ7 0x0080 /* lowest - parallel printer */ -/* Initialization control word 1. Written to even address. */ -#define ICW1_IC4 0x01 /* ICW4 present */ -#define ICW1_SNGL 0x02 /* 1 = single, 0 = cascaded */ -#define ICW1_ADI 0x04 /* 1 = 4, 0 = 8 byte vectors */ -#define ICW1_LTIM 0x08 /* 1 = level trigger, 0 = edge */ -#define ICW1_RESET 0x10 /* must be 1 */ -/* 0x20 - 0x80 - in 8080/8085 mode only */ - -/* Initialization control word 2. Written to the odd address. */ -/* No definitions, it is the base vector of the IDT for 8086 mode */ - -/* Initialization control word 3. Written to the odd address. */ -/* For a master PIC, bitfield indicating a slave 8259 on given input */ -/* For slave, lower 3 bits are the slave's ID binary id on master */ - -/* Initialization control word 4. Written to the odd address. */ -#define ICW4_8086 0x01 /* 1 = 8086, 0 = 8080 */ -#define ICW4_AEOI 0x02 /* 1 = Auto EOI */ -#define ICW4_MS 0x04 /* 1 = buffered master, 0 = slave */ -#define ICW4_BUF 0x08 /* 1 = enable buffer mode */ -#define ICW4_SFNM 0x10 /* 1 = special fully nested mode */ - -/* Operation control words. Written after initialization. */ - -/* Operation control word type 1 */ /* - * No definitions. Written to the odd address. Bitmask for interrupts. - * 1 = disabled. - */ - -/* Operation control word type 2. Bit 3 (0x08) must be zero. Even address. */ -#define OCW2_L0 0x01 /* Level */ -#define OCW2_L1 0x02 -#define OCW2_L2 0x04 -/* 0x08 must be 0 to select OCW2 vs OCW3 */ -/* 0x10 must be 0 to select OCW2 vs ICW1 */ -#define OCW2_EOI 0x20 /* 1 = EOI */ -#define OCW2_SL 0x40 /* EOI mode */ -#define OCW2_R 0x80 /* EOI mode */ - -/* Operation control word type 3. Bit 3 (0x08) must be set. Even address. */ -#define OCW3_RIS 0x01 /* 1 = read IS, 0 = read IR */ -#define OCW3_RR 0x02 /* register read */ -#define OCW3_P 0x04 /* poll mode command */ -/* 0x08 must be 1 to select OCW3 vs OCW2 */ -#define OCW3_SEL 0x08 /* must be 1 */ -/* 0x10 must be 0 to select OCW3 vs ICW1 */ -#define OCW3_SMM 0x20 /* special mode mask */ -#define OCW3_ESMM 0x40 /* enable SMM */ - -/* * Interrupt Control offset into Interrupt descriptor table (IDT) */ #define ICU_OFFSET 32 /* 0-31 are processor exceptions */ @@ -130,4 +80,4 @@ void atpic_startup(void); #endif -#endif /* !_I386_ISA_ICU_H_ */ +#endif /* !_AMD64_ISA_ICU_H_ */ ==== //depot/projects/smpng/sys/boot/alpha/common/conf.c#3 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/boot/alpha/common/conf.c,v 1.4 2002/12/19 19:34:58 jake Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.5 2004/01/04 23:21:01 obrien Exp $"); + #include <stand.h> #include "libalpha/libalpha.h" #ifdef LOADER_NET_SUPPORT ==== //depot/projects/smpng/sys/boot/alpha/common/main.c#2 (text+ko) ==== @@ -23,10 +23,10 @@ * 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/boot/alpha/common/main.c,v 1.13 2000/10/25 23:36:01 dfr Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/alpha/common/main.c,v 1.14 2004/01/04 23:21:01 obrien Exp $"); #include <stand.h> #include <string.h> ==== //depot/projects/smpng/sys/boot/alpha/libalpha/OSFpal.c#2 (text+ko) ==== @@ -1,8 +1,6 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/OSFpal.c,v 1.3 2000/06/03 08:24:37 dfr Exp $ - * From $NetBSD: OSFpal.c,v 1.5 1998/06/24 01:33:19 ross Exp $ + * $NetBSD: OSFpal.c,v 1.5 1998/06/24 01:33:19 ross Exp $ */ - /* * Copyright (c) 1994, 1996 Carnegie-Mellon University. * All rights reserved. @@ -30,6 +28,9 @@ * rights to redistribute these changes. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/OSFpal.c,v 1.4 2004/01/04 23:21:01 obrien Exp $"); + #include <sys/types.h> #include <stand.h> ==== //depot/projects/smpng/sys/boot/alpha/libalpha/alpha_copy.c#2 (text+ko) ==== @@ -22,9 +22,11 @@ * 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/boot/alpha/libalpha/alpha_copy.c,v 1.5 2000/08/03 09:49:44 jhb Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/alpha_copy.c,v 1.6 2004/01/04 23:21:01 obrien Exp $"); + /* * MD primitives supporting placement of module data * ==== //depot/projects/smpng/sys/boot/alpha/libalpha/alpha_module.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/boot/alpha/libalpha/alpha_module.c,v 1.3 1999/08/28 00:39:26 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/alpha_module.c,v 1.4 2004/01/04 23:21:01 obrien Exp $"); + /* * alpha-specific module functionality. * ==== //depot/projects/smpng/sys/boot/alpha/libalpha/bootinfo.c#3 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/boot/alpha/libalpha/bootinfo.c,v 1.13 2003/04/04 16:35:14 phk Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/bootinfo.c,v 1.14 2004/01/04 23:21:01 obrien Exp $"); + #include <stand.h> #include <string.h> #include <sys/param.h> ==== //depot/projects/smpng/sys/boot/alpha/libalpha/delay.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/boot/alpha/libalpha/delay.c,v 1.2 1999/08/28 00:39:27 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/delay.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include <stand.h> #include <machine/rpb.h> ==== //depot/projects/smpng/sys/boot/alpha/libalpha/devicename.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/boot/alpha/libalpha/devicename.c,v 1.4 1999/08/28 00:39:27 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/devicename.c,v 1.5 2004/01/04 23:21:01 obrien Exp $"); + #include <stand.h> #include <string.h> #include <sys/disklabel.h> ==== //depot/projects/smpng/sys/boot/alpha/libalpha/elf_freebsd.c#3 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/alpha/libalpha/elf_freebsd.c,v 1.12 2003/05/01 03:56:28 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -37,7 +36,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -76,6 +74,9 @@ * @(#)boot.c 8.1 (Berkeley) 6/10/93 */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/elf_freebsd.c,v 1.13 2004/01/04 23:21:01 obrien Exp $"); + #include <stand.h> #include <string.h> ==== //depot/projects/smpng/sys/boot/alpha/libalpha/getsecs.c#2 (text+ko) ==== @@ -1,8 +1,10 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/getsecs.c,v 1.2 1999/08/28 00:39:27 peter Exp $ - * From: $NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $ + * $NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/getsecs.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include <sys/param.h> #include <machine/prom.h> #include <machine/rpb.h> ==== //depot/projects/smpng/sys/boot/alpha/libalpha/prom.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/alpha/libalpha/prom.c,v 1.3 1999/08/28 00:39:28 peter Exp $ */ /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */ /* @@ -27,6 +26,9 @@ * the rights to redistribute these changes. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/prom.c,v 1.4 2004/01/04 23:21:01 obrien Exp $"); + #include <sys/types.h> #include <machine/prom.h> ==== //depot/projects/smpng/sys/boot/alpha/libalpha/reboot.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/boot/alpha/libalpha/reboot.c,v 1.2 1999/08/28 00:39:29 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/reboot.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include <stand.h> #include <machine/rpb.h> ==== //depot/projects/smpng/sys/boot/alpha/libalpha/srmdisk.c#3 (text+ko) ==== @@ -23,10 +23,11 @@ * 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/boot/alpha/libalpha/srmdisk.c,v 1.12 2003/04/04 16:35:14 phk Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/srmdisk.c,v 1.13 2004/01/04 23:21:01 obrien Exp $"); + /* * SRM disk device handling. * @@ -34,7 +35,6 @@ * * - NetBSD libi386/biosdisk.c * - FreeBSD biosboot/disk.c - * */ #include <stand.h> ==== //depot/projects/smpng/sys/boot/alpha/libalpha/srmnet.c#2 (text+ko) ==== @@ -1,6 +1,5 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/srmnet.c,v 1.4 1999/09/06 18:32:40 dfr Exp $ - * From: $NetBSD: if_prom.c,v 1.10 1997/09/06 14:08:33 drochner Exp $ + * $NetBSD: if_prom.c,v 1.10 1997/09/06 14:08:33 drochner Exp $ */ /* @@ -35,6 +34,9 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/srmnet.c,v 1.5 2004/01/04 23:21:01 obrien Exp $"); + #include <sys/param.h> #include <sys/types.h> ==== //depot/projects/smpng/sys/boot/alpha/libalpha/time.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/boot/alpha/libalpha/time.c,v 1.2 1999/08/28 00:39:30 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/time.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include <stand.h> /* ==== //depot/projects/smpng/sys/boot/arc/lib/abort.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/boot/arc/lib/abort.c,v 1.2 1999/08/28 00:39:35 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/abort.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include <errno.h> #include <sys/types.h> #include "arctypes.h" ==== //depot/projects/smpng/sys/boot/arc/lib/arcconsole.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/arc/lib/arcconsole.c,v 1.2 1999/08/28 00:39:36 peter Exp $ */ /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */ /* @@ -27,6 +26,9 @@ * the rights to redistribute these changes. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/arcconsole.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include <sys/types.h> #include "bootstrap.h" ==== //depot/projects/smpng/sys/boot/arc/lib/arcdisk.c#4 (text+ko) ==== @@ -23,10 +23,11 @@ * 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/boot/arc/lib/arcdisk.c,v 1.6 2003/04/16 21:09:41 phk Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/arcdisk.c,v 1.7 2004/01/04 23:28:01 obrien Exp $"); + /* * ARC disk device handling. * @@ -34,12 +35,10 @@ * * - NetBSD libi386/biosdisk.c * - FreeBSD biosboot/disk.c - * */ #include <stand.h> - #include <machine/stdarg.h> #include "bootstrap.h" ==== //depot/projects/smpng/sys/boot/arc/lib/bootinfo.c#3 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/boot/arc/lib/bootinfo.c,v 1.5 2003/04/04 16:35:14 phk Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/bootinfo.c,v 1.6 2004/01/04 23:28:01 obrien Exp $"); + #include <stand.h> #include <string.h> #include <sys/param.h> ==== //depot/projects/smpng/sys/boot/arc/lib/delay.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/boot/arc/lib/delay.c,v 1.2 1999/08/28 00:39:37 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/delay.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include <errno.h> #include <sys/types.h> #include "arctypes.h" ==== //depot/projects/smpng/sys/boot/arc/lib/devicename.c#3 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/boot/arc/lib/devicename.c,v 1.3 2003/04/16 21:09:41 phk Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/devicename.c,v 1.4 2004/01/04 23:28:01 obrien Exp $"); + #include <stand.h> #include <string.h> #include "bootstrap.h" ==== //depot/projects/smpng/sys/boot/arc/lib/elf_freebsd.c#3 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.4 2003/05/01 03:56:29 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -37,7 +36,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -76,6 +74,9 @@ * @(#)boot.c 8.1 (Berkeley) 6/10/93 */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.5 2004/01/04 23:28:01 obrien Exp $"); + #include <stand.h> #include <string.h> ==== //depot/projects/smpng/sys/boot/arc/lib/module.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401061947.i06JlfNw082489>