PERFORCE change 35032 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Jul 26 01:15:59 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=35032
Change 35032 by marcel at marcel_nfs on 2003/07/26 01:15:50
IFC @35031
Affected files ...
.. //depot/projects/ia64/contrib/smbfs/lib/smb/kiconv.c#3 integrate
.. //depot/projects/ia64/contrib/smbfs/lib/smb/rap.c#2 integrate
.. //depot/projects/ia64/lib/libc/ia64/gen/_setjmp.S#6 integrate
.. //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/context.S#2 integrate
.. //depot/projects/ia64/release/Makefile#60 integrate
.. //depot/projects/ia64/sys/amd64/acpica/OsdEnvironment.c#3 integrate
.. //depot/projects/ia64/sys/amd64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/ia64/sys/amd64/acpica/acpi_wakeup.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/amd64-gdbstub.c#3 integrate
.. //depot/projects/ia64/sys/amd64/amd64/atomic.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/autoconf.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/critical.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/db_disasm.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/db_interface.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/db_trace.c#3 integrate
.. //depot/projects/ia64/sys/amd64/amd64/dump_machdep.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/elf_machdep.c#3 integrate
.. //depot/projects/ia64/sys/amd64/amd64/genassym.c#5 integrate
.. //depot/projects/ia64/sys/amd64/amd64/identcpu.c#4 integrate
.. //depot/projects/ia64/sys/amd64/amd64/in_cksum.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/initcpu.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/legacy.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/machdep.c#11 integrate
.. //depot/projects/ia64/sys/amd64/amd64/mem.c#4 integrate
.. //depot/projects/ia64/sys/amd64/amd64/nexus.c#5 integrate
.. //depot/projects/ia64/sys/amd64/amd64/pmap.c#14 integrate
.. //depot/projects/ia64/sys/amd64/amd64/sys_machdep.c#4 integrate
.. //depot/projects/ia64/sys/amd64/amd64/trap.c#8 integrate
.. //depot/projects/ia64/sys/amd64/amd64/tsc.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#7 integrate
.. //depot/projects/ia64/sys/amd64/ia32/ia32_genassym.c#2 integrate
.. //depot/projects/ia64/sys/amd64/ia32/ia32_misc.c#2 integrate
.. //depot/projects/ia64/sys/amd64/ia32/ia32_signal.c#3 integrate
.. //depot/projects/ia64/sys/amd64/ia32/ia32_syscall.c#3 integrate
.. //depot/projects/ia64/sys/amd64/ia32/ia32_sysvec.c#3 integrate
.. //depot/projects/ia64/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/ia64/sys/amd64/isa/intr_machdep.c#2 integrate
.. //depot/projects/ia64/sys/amd64/isa/isa.c#2 integrate
.. //depot/projects/ia64/sys/amd64/isa/isa_dma.c#2 integrate
.. //depot/projects/ia64/sys/amd64/isa/ithread.c#2 integrate
.. //depot/projects/ia64/sys/amd64/isa/npx.c#2 integrate
.. //depot/projects/ia64/sys/amd64/pci/pci_bus.c#2 integrate
.. //depot/projects/ia64/sys/amd64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/ia64/sys/coda/coda_fbsd.c#7 integrate
.. //depot/projects/ia64/sys/coda/coda_vnops.c#11 integrate
.. //depot/projects/ia64/sys/compat/linux/linux_misc.c#26 integrate
.. //depot/projects/ia64/sys/conf/kern.pre.mk#21 integrate
.. //depot/projects/ia64/sys/conf/kmod.mk#24 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwohcireg.h#10 integrate
.. //depot/projects/ia64/sys/dev/raidframe/rf_freebsdkintf.c#13 integrate
.. //depot/projects/ia64/sys/fs/hpfs/hpfs_vfsops.c#16 integrate
.. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#19 integrate
.. //depot/projects/ia64/sys/fs/ntfs/ntfs_subr.c#12 integrate
.. //depot/projects/ia64/sys/fs/ntfs/ntfs_vfsops.c#15 integrate
.. //depot/projects/ia64/sys/fs/nwfs/nwfs_io.c#8 integrate
.. //depot/projects/ia64/sys/fs/smbfs/smbfs_io.c#11 integrate
.. //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#18 integrate
.. //depot/projects/ia64/sys/fs/udf/udf_vfsops.c#12 integrate
.. //depot/projects/ia64/sys/fs/unionfs/union_subr.c#14 integrate
.. //depot/projects/ia64/sys/fs/unionfs/union_vnops.c#11 integrate
.. //depot/projects/ia64/sys/gnu/ext2fs/ext2_vfsops.c#19 integrate
.. //depot/projects/ia64/sys/i386/ibcs2/imgact_coff.c#15 integrate
.. //depot/projects/ia64/sys/ia64/include/acpica_machdep.h#2 integrate
.. //depot/projects/ia64/sys/ia64/include/setjmp.h#5 integrate
.. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vfsops.c#19 integrate
.. //depot/projects/ia64/sys/kern/kern_descrip.c#61 integrate
.. //depot/projects/ia64/sys/kern/kern_exec.c#52 integrate
.. //depot/projects/ia64/sys/kern/uipc_socket2.c#25 integrate
.. //depot/projects/ia64/sys/kern/vfs_export.c#11 integrate
.. //depot/projects/ia64/sys/kern/vfs_syscalls.c#49 integrate
.. //depot/projects/ia64/sys/kern/vfs_vnops.c#33 integrate
.. //depot/projects/ia64/sys/kern/vnode_if.src#14 integrate
.. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#36 integrate
.. //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#19 integrate
.. //depot/projects/ia64/sys/vm/swap_pager.c#34 integrate
.. //depot/projects/ia64/sys/vm/uma_core.c#44 integrate
.. //depot/projects/ia64/sys/vm/vm_contig.c#16 integrate
.. //depot/projects/ia64/tools/tools/tinderbox/current.rc#3 integrate
.. //depot/projects/ia64/usr.sbin/mount_nwfs/mount_nwfs.c#2 integrate
Differences ...
==== //depot/projects/ia64/contrib/smbfs/lib/smb/kiconv.c#3 (text+ko) ====
@@ -30,6 +30,7 @@
* SUCH DAMAGE.
*
* $Id: kiconv.c,v 1.3 2001/08/22 03:31:36 bp Exp $
+ * $FreeBSD: src/contrib/smbfs/lib/smb/kiconv.c,v 1.2 2003/07/26 04:03:18 peter Exp $
*/
#include <sys/types.h>
@@ -48,7 +49,7 @@
{
struct iconv_add_in din;
struct iconv_add_out dout;
- int olen;
+ size_t olen;
if (strlen(from) > ICONV_CSNMAXLEN || strlen(to) > ICONV_CSNMAXLEN)
return EINVAL;
==== //depot/projects/ia64/contrib/smbfs/lib/smb/rap.c#2 (text+ko) ====
@@ -30,6 +30,7 @@
* SUCH DAMAGE.
*
* $Id: rap.c,v 1.8 2001/02/24 15:56:05 bp Exp $
+ * $FreeBSD: src/contrib/smbfs/lib/smb/rap.c,v 1.2 2003/07/26 04:02:22 peter Exp $
*
* This is very simple implementation of RAP protocol.
*/
@@ -40,7 +41,7 @@
#include <err.h>
#include <stdio.h>
#include <unistd.h>
-#include <strings.h>
+#include <string.h>
#include <stdlib.h>
#include <sysexits.h>
==== //depot/projects/ia64/lib/libc/ia64/gen/_setjmp.S#6 (text+ko) ====
@@ -51,7 +51,7 @@
.file "setjmp.s"
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/_setjmp.S,v 1.10 2003/03/05 04:39:24 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/_setjmp.S,v 1.11 2003/07/25 22:36:48 marcel Exp $");
#define LOCORE
#include <machine/setjmp.h>
@@ -171,11 +171,10 @@
mov r3 = b4
;;
st8 [r11] = r2, J_B5-J_B3
- st8 [r10] = r3, J_GP-J_B4
+ st8 [r10] = r3
mov r2 = b5
;;
st8 [r11] = r2
- st8 [r10] = r1
;;
//
// return
@@ -291,12 +290,11 @@
mov b1 = r2
mov b2 = r3
ld8 r2 = [r10], J_B5-J_B3
- ld8 r3 = [r11], J_GP-J_B4
+ ld8 r3 = [r11]
;;
mov b3 = r2
mov b4 = r3
ld8 r2 = [r10]
- ld8 r1 = [r11]
ld8 r21 = [r31] // get user unat
;;
mov b5 = r2
==== //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/context.S#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libpthread/arch/amd64/amd64/context.S,v 1.1 2003/07/19 04:44:21 deischen Exp $");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/amd64/amd64/context.S,v 1.2 2003/07/26 02:36:50 davidxu Exp $");
/*
* The following notes ("cheat sheet") was provided by Peter Wemm.
@@ -123,7 +123,7 @@
* No values are saved to mc_trapno, mc_addr, mc_err, mc_cs, or mc_ss.
* For the FPU state, only the floating point control word is stored.
*/
-ENTRY(_amd64_ctx_save)
+ENTRY(_amd64_save_context)
cmpq $0, %rdi /* check for null pointer */
jne 1f
movq $-1, %rax
@@ -149,7 +149,7 @@
popq %rax
movq %rax, MC_RFLAGS(%rdi) /* save flags */
movq %rsp, %rax /* setcontext pushes the return */
- addq $4, %rax /* address onto the stack; */
+ addq $8, %rax /* address onto the stack; */
movq %rax, MC_RSP(%rdi) /* account for this -- ???. */
fnstcw MC_FP_CW_OFFSET(%rdi) /* save FPU control word */
movq $MC_OWNEDFP_NONE, MC_OWNEDFP_OFFSET(%rdi) /* no FP */
@@ -161,7 +161,7 @@
/*
* _amd64_ctx_restore(mcontext_t *mcp, intptr_t val, intptr_t *loc);
*/
-ENTRY(_amd64_ctx_restore)
+ENTRY(_amd64_restore_context)
cmpq $0, %rdi /* check for null pointer */
jne 1f
movq $-1, %rax
@@ -198,7 +198,7 @@
5: movq MC_RSP(%rdi), %rsp /* switch to context stack */
movq MC_RIP(%rdi), %rax /* return address on stack */
pushq %rax
- movq MC_RSI(%rdi), %rax /* rdi on stack */
+ movq MC_RDI(%rdi), %rax /* rdi on stack */
pushq %rax
movq MC_RDX(%rdi), %rax /* rdx on stack */
pushq %rax
@@ -209,7 +209,7 @@
movq MC_RAX(%rdi), %rax /* restore rax */
/* At this point we're done with the context. */
cmpq $0, %rdx /* set *loc to val */
- je 7f
+ je 6f
movq %rsi, (%rdx)
6: popfq /* restore flags */
popq %rsi /* restore rsi, rdx, and rdi */
==== //depot/projects/ia64/release/Makefile#60 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.799 2003/07/25 13:39:11 ru Exp $
+# $FreeBSD: src/release/Makefile,v 1.801 2003/07/26 06:47:40 scottl Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -736,7 +736,7 @@
sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \
${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
@gzip -9vc mfsroot > ${RD}/mfsroot/mfsroot.gz
- @rm mfsroot mfsroot-small
+ @rm -f mfsroot mfsroot-small
touch ${.TARGET}
release.10:
==== //depot/projects/ia64/sys/amd64/acpica/OsdEnvironment.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/amd64/acpica/OsdEnvironment.c,v 1.9 2003/05/31 06:47:05 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.10 2003/07/25 21:10:18 obrien Exp $");
+
/*
* 6.1 : Environmental support
*/
==== //depot/projects/ia64/sys/amd64/acpica/acpi_machdep.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/amd64/acpica/acpi_machdep.c,v 1.9 2003/05/01 01:05:21 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.10 2003/07/25 21:10:19 obrien Exp $");
+
#include <sys/param.h>
#include <sys/bus.h>
==== //depot/projects/ia64/sys/amd64/acpica/acpi_wakeup.c#2 (text+ko) ====
@@ -23,9 +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/amd64/acpica/acpi_wakeup.c,v 1.19 2003/05/01 01:05:21 peter Exp $
*/
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.20 2003/07/25 21:10:19 obrien Exp $");
+
#include <sys/param.h>
#include <sys/bus.h>
==== //depot/projects/ia64/sys/amd64/amd64/amd64-gdbstub.c#3 (text+ko) ====
@@ -92,7 +92,8 @@
*
****************************************************************************/
-/* $FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.24 2003/05/31 22:00:57 peter Exp $ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.25 2003/07/25 21:15:44 obrien Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
==== //depot/projects/ia64/sys/amd64/amd64/atomic.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/amd64/amd64/atomic.c,v 1.4 2000/09/06 11:21:14 phk Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/atomic.c,v 1.5 2003/07/25 21:15:44 obrien Exp $");
+
/* This file creates publically callable functions to perform various
* simple arithmetic on memory which is atomic in the presence of
* interrupts and multiple processors.
==== //depot/projects/ia64/sys/amd64/amd64/autoconf.c#2 (text+ko) ====
@@ -33,10 +33,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.173 2003/05/01 01:05:21 peter Exp $
+ * @(#)autoconf.c 7.1 (Berkeley) 5/9/91
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.174 2003/07/25 21:15:44 obrien Exp $");
+
/*
* Setup the system to run on the current machine.
*
==== //depot/projects/ia64/sys/amd64/amd64/critical.c#2 (text+ko) ====
@@ -1,10 +1,11 @@
/*-
* Copyright (c) 2001 Matthew Dillon. This code is distributed under
* the BSD copyright, /usr/src/COPYRIGHT.
- *
- * $FreeBSD: src/sys/amd64/amd64/critical.c,v 1.9 2003/05/01 01:05:21 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.10 2003/07/25 21:15:44 obrien Exp $");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/signalvar.h>
==== //depot/projects/ia64/sys/amd64/amd64/db_disasm.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
*
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
- *
- * $FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.26 2002/03/23 14:27:06 bde Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.27 2003/07/25 21:15:44 obrien Exp $");
+
/*
* Instruction disassembler.
*/
==== //depot/projects/ia64/sys/amd64/amd64/db_interface.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
*
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
- *
- * $FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.73 2003/05/30 01:01:07 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.74 2003/07/25 21:15:44 obrien Exp $");
+
/*
* Interface to new debugger.
*/
==== //depot/projects/ia64/sys/amd64/amd64/db_trace.c#3 (text+ko) ====
@@ -22,10 +22,11 @@
*
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
- *
- * $FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.57 2003/05/31 22:02:11 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.58 2003/07/25 21:15:44 obrien Exp $");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
==== //depot/projects/ia64/sys/amd64/amd64/dump_machdep.c#2 (text+ko) ====
@@ -31,10 +31,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/amd64/amd64/dump_machdep.c,v 1.8 2003/05/01 01:05:21 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.9 2003/07/25 21:15:44 obrien Exp $");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
==== //depot/projects/ia64/sys/amd64/amd64/elf_machdep.c#3 (text+ko) ====
@@ -21,10 +21,11 @@
* THEORY OF LIABILITY, WHETHER IN 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/amd64/amd64/elf_machdep.c,v 1.15 2003/05/11 22:40:24 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.16 2003/07/25 21:15:44 obrien Exp $");
+
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
==== //depot/projects/ia64/sys/amd64/amd64/genassym.c#5 (text+ko) ====
@@ -33,10 +33,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91
- * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.147 2003/05/23 05:04:53 peter Exp $
+ * @(#)genassym.c 5.11 (Berkeley) 5/10/91
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.148 2003/07/25 21:15:44 obrien Exp $");
+
#include "opt_compat.h"
#include "opt_kstack_pages.h"
==== //depot/projects/ia64/sys/amd64/amd64/identcpu.c#4 (text+ko) ====
@@ -38,9 +38,11 @@
* SUCH DAMAGE.
*
* from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- * $FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.125 2003/05/27 21:59:56 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.126 2003/07/25 21:15:44 obrien Exp $");
+
#include "opt_cpu.h"
#include <sys/param.h>
==== //depot/projects/ia64/sys/amd64/amd64/in_cksum.c#2 (text+ko) ====
@@ -1,4 +1,3 @@
-/* $FreeBSD: src/sys/amd64/amd64/in_cksum.c,v 1.3 2001/10/05 18:58:22 dfr Exp $ */
/* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
/*
@@ -39,6 +38,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/in_cksum.c,v 1.4 2003/07/25 21:15:44 obrien Exp $");
#include <sys/param.h>
#include <sys/mbuf.h>
==== //depot/projects/ia64/sys/amd64/amd64/initcpu.c#2 (text+ko) ====
@@ -25,10 +25,11 @@
* THEORY OF LIABILITY, WHETHER IN 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/amd64/amd64/initcpu.c,v 1.45 2003/05/01 01:05:21 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.46 2003/07/25 21:15:44 obrien Exp $");
+
#include "opt_cpu.h"
#include <sys/param.h>
==== //depot/projects/ia64/sys/amd64/amd64/legacy.c#2 (text+ko) ====
@@ -25,10 +25,11 @@
* 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/amd64/amd64/legacy.c,v 1.50 2003/05/01 01:05:21 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.51 2003/07/25 21:15:44 obrien Exp $");
+
/*
* This code implements a system driver for legacy systems that do not
* support ACPI or when ACPI support is not present in the kernel.
==== //depot/projects/ia64/sys/amd64/amd64/machdep.c#11 (text+ko) ====
@@ -34,10 +34,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.586 2003/07/24 08:51:22 davidxu Exp $
+ * @(#)machdep.c 7.4 (Berkeley) 6/3/91
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.587 2003/07/25 21:15:44 obrien Exp $");
+
#include "opt_atalk.h"
#include "opt_compat.h"
#include "opt_cpu.h"
==== //depot/projects/ia64/sys/amd64/amd64/mem.c#4 (text+ko) ====
@@ -36,11 +36,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from: Utah $Hdr: mem.c 1.13 89/10/08$
- * from: @(#)mem.c 7.2 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/amd64/mem.c,v 1.109 2003/06/22 12:59:43 simokawa Exp $
+ * Utah $Hdr: mem.c 1.13 89/10/08$
+ * @(#)mem.c 7.2 (Berkeley) 5/9/91
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.110 2003/07/25 21:15:44 obrien Exp $");
+
/*
* Memory special file
*/
==== //depot/projects/ia64/sys/amd64/amd64/nexus.c#5 (text+ko) ====
@@ -25,10 +25,11 @@
* 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/amd64/amd64/nexus.c,v 1.53 2003/05/31 21:58:55 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.54 2003/07/25 21:15:44 obrien Exp $");
+
/*
* This code implements a `root nexus' for Intel Architecture
* machines. The function of the root nexus is to serve as an
==== //depot/projects/ia64/sys/amd64/amd64/pmap.c#14 (text+ko) ====
@@ -38,8 +38,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.425 2003/07/25 18:58:39 alc Exp $
+ * @(#)pmap.c 7.7 (Berkeley) 5/12/91
*/
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
@@ -73,6 +72,9 @@
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.426 2003/07/25 21:15:44 obrien Exp $");
+
/*
* Manages physical address maps.
*
==== //depot/projects/ia64/sys/amd64/amd64/sys_machdep.c#4 (text+ko) ====
@@ -30,11 +30,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91
- * $FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.84 2003/07/23 23:17:15 peter Exp $
- *
+ * @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.85 2003/07/25 21:15:44 obrien Exp $");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/lock.h>
==== //depot/projects/ia64/sys/amd64/amd64/trap.c#8 (text+ko) ====
@@ -34,10 +34,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from: @(#)trap.c 7.4 (Berkeley) 5/13/91
- * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.261 2003/06/15 00:31:22 davidxu Exp $
+ * @(#)trap.c 7.4 (Berkeley) 5/13/91
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.262 2003/07/25 21:15:44 obrien Exp $");
+
/*
* AMD64 Trap and System call handling
*/
==== //depot/projects/ia64/sys/amd64/amd64/tsc.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/amd64/amd64/tsc.c,v 1.200 2003/05/01 01:05:22 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.201 2003/07/25 21:15:44 obrien Exp $");
+
#include "opt_clock.h"
#include <sys/param.h>
==== //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#7 (text+ko) ====
@@ -36,11 +36,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
+ * @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
* Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- * $FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.213 2003/07/25 00:21:37 davidxu Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.214 2003/07/25 21:15:45 obrien Exp $");
+
#include "opt_isa.h"
#include "opt_kstack_pages.h"
==== //depot/projects/ia64/sys/amd64/ia32/ia32_genassym.c#2 (text+ko) ====
@@ -1,4 +1,5 @@
-/* $FreeBSD: src/sys/amd64/ia32/ia32_genassym.c,v 1.1 2003/05/14 04:10:48 peter Exp $ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_genassym.c,v 1.2 2003/07/25 21:16:26 obrien Exp $");
#include "opt_compat.h"
==== //depot/projects/ia64/sys/amd64/ia32/ia32_misc.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/amd64/ia32/ia32_misc.c,v 1.10 2003/05/14 04:10:48 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_misc.c,v 1.11 2003/07/25 21:16:26 obrien Exp $");
+
#include "opt_compat.h"
#include <sys/param.h>
==== //depot/projects/ia64/sys/amd64/ia32/ia32_signal.c#3 (text+ko) ====
@@ -33,10 +33,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/amd64/ia32/ia32_signal.c,v 1.2 2003/05/23 05:07:33 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.3 2003/07/25 21:16:26 obrien Exp $");
+
#include "opt_compat.h"
#include <sys/param.h>
==== //depot/projects/ia64/sys/amd64/ia32/ia32_syscall.c#3 (text+ko) ====
@@ -33,10 +33,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/amd64/ia32/ia32_syscall.c,v 1.2 2003/05/31 06:49:53 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.3 2003/07/25 21:16:26 obrien Exp $");
+
/*
* 386 Trap and System call handling
*/
==== //depot/projects/ia64/sys/amd64/ia32/ia32_sysvec.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/amd64/ia32/ia32_sysvec.c,v 1.5 2003/05/23 05:07:33 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_sysvec.c,v 1.6 2003/07/25 21:16:26 obrien Exp $");
+
#include "opt_compat.h"
#define __ELF_WORD_SIZE 32
==== //depot/projects/ia64/sys/amd64/isa/clock.c#2 (text+ko) ====
@@ -33,10 +33,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/isa/clock.c,v 1.199 2003/05/01 01:05:24 peter Exp $
+ * @(#)clock.c 7.2 (Berkeley) 5/12/91
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.200 2003/07/25 21:18:52 obrien Exp $");
+
/*
* Routines to handle clock hardware.
*/
==== //depot/projects/ia64/sys/amd64/isa/intr_machdep.c#2 (text+ko) ====
@@ -33,10 +33,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $FreeBSD: src/sys/amd64/isa/intr_machdep.c,v 1.75 2003/05/01 01:05:24 peter Exp $
+ * @(#)isa.c 7.2 (Berkeley) 5/13/91
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/isa/intr_machdep.c,v 1.76 2003/07/25 21:18:52 obrien Exp $");
+
#include "opt_isa.h"
#include <sys/param.h>
==== //depot/projects/ia64/sys/amd64/isa/isa.c#2 (text+ko) ====
@@ -22,10 +22,7 @@
* 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/amd64/isa/isa.c,v 1.143 2003/05/01 01:05:24 peter Exp $
*/
-
/*
* Modifications for Intel architecture by Garrett A. Wollman.
* Copyright 1998 Massachusetts Institute of Technology
@@ -56,6 +53,9 @@
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.144 2003/07/25 21:18:52 obrien Exp $");
+
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/malloc.h>
==== //depot/projects/ia64/sys/amd64/isa/isa_dma.c#2 (text+ko) ====
@@ -33,10 +33,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.14 2003/05/01 01:05:25 peter Exp $
+ * @(#)isa.c 7.2 (Berkeley) 5/13/91
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.15 2003/07/25 21:18:52 obrien Exp $");
+
/*
* code to manage AT bus
*
==== //depot/projects/ia64/sys/amd64/isa/ithread.c#2 (text+ko) ====
@@ -25,10 +25,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * From BSDI: intr.c,v 1.6.2.5 1999/07/06 19:16:52 cp Exp
- * $FreeBSD: src/sys/amd64/isa/ithread.c,v 1.21 2003/05/01 01:05:25 peter Exp $
+ * BSDI Id: intr.c,v 1.6.2.5 1999/07/06 19:16:52 cp Exp
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/isa/ithread.c,v 1.22 2003/07/25 21:18:52 obrien Exp $");
+
/* Interrupt thread code. */
#include <sys/param.h>
==== //depot/projects/ia64/sys/amd64/isa/npx.c#2 (text+ko) ====
@@ -31,10 +31,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from: @(#)npx.c 7.2 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/isa/npx.c,v 1.141 2003/05/01 01:05:25 peter Exp $
+ * @(#)npx.c 7.2 (Berkeley) 5/12/91
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/isa/npx.c,v 1.142 2003/07/25 21:18:52 obrien Exp $");
+
#include "opt_debug_npx.h"
#include "opt_isa.h"
==== //depot/projects/ia64/sys/amd64/pci/pci_bus.c#2 (text+ko) ====
@@ -22,11 +22,11 @@
* THEORY OF LIABILITY, WHETHER IN 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/amd64/pci/pci_bus.c,v 1.99 2003/05/01 01:05:25 peter Exp $
- *
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.100 2003/07/25 21:19:18 obrien Exp $");
+
#include "opt_cpu.h"
#include <sys/param.h>
==== //depot/projects/ia64/sys/amd64/pci/pci_cfgreg.c#2 (text+ko) ====
@@ -24,11 +24,11 @@
* THEORY OF LIABILITY, WHETHER IN 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/amd64/pci/pci_cfgreg.c,v 1.102 2003/05/01 01:05:25 peter Exp $
- *
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.103 2003/07/25 21:19:19 obrien Exp $");
+
#include <sys/param.h> /* XXX trim includes */
#include <sys/systm.h>
#include <sys/bus.h>
==== //depot/projects/ia64/sys/coda/coda_fbsd.c#7 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.30 2003/06/10 21:21:59 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.31 2003/07/26 07:32:20 phk Exp $");
#include "vcoda.h"
@@ -127,7 +127,7 @@
if (cfvp == NULL) {
opened_internally = 1;
- error = VOP_OPEN(vp, FREAD, cred, p);
+ error = VOP_OPEN(vp, FREAD, cred, p, -1);
printf("coda_getp: Internally Opening %p\n", vp);
if (error) {
==== //depot/projects/ia64/sys/coda/coda_vnops.c#11 (text+ko) ====
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.49 2003/06/15 18:45:15 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.50 2003/07/26 07:32:20 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -296,7 +296,7 @@
cp->c_inode = inode;
/* Open the cache file. */
- error = VOP_OPEN(vp, flag, cred, td);
+ error = VOP_OPEN(vp, flag, cred, td, -1);
if (error) {
printf("coda_open: VOP_OPEN on container failed %d\n", error);
return (error);
@@ -467,7 +467,7 @@
opened_internally = 1;
MARK_INT_GEN(CODA_OPEN_STATS);
error = VOP_OPEN(vp, (rw == UIO_READ ? FREAD : FWRITE),
- cred, td);
+ cred, td, -1);
printf("coda_rdwr: Internally Opening %p\n", vp);
if (error) {
printf("coda_rdwr: VOP_OPEN on container failed %d\n", error);
@@ -1646,7 +1646,7 @@
if (cp->c_ovp == NULL) {
opened_internally = 1;
MARK_INT_GEN(CODA_OPEN_STATS);
- error = VOP_OPEN(vp, FREAD, cred, td);
+ error = VOP_OPEN(vp, FREAD, cred, td, -1);
printf("coda_readdir: Internally Opening %p\n", vp);
if (error) {
printf("coda_readdir: VOP_OPEN on container failed %d\n", error);
==== //depot/projects/ia64/sys/compat/linux/linux_misc.c#26 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.145 2003/07/18 10:26:09 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.146 2003/07/26 07:32:20 phk Exp $");
#include "opt_mac.h"
@@ -310,7 +310,7 @@
if (error)
goto cleanup;
#endif
- error = VOP_OPEN(vp, FREAD, td->td_ucred, td);
+ error = VOP_OPEN(vp, FREAD, td->td_ucred, td, -1);
if (error)
goto cleanup;
==== //depot/projects/ia64/sys/conf/kern.pre.mk#21 (text+ko) ====
@@ -3,7 +3,7 @@
# Unified Makefile for building kernels. This includes all the definitions
# that need to be included before %BEFORE_DEPEND
#
-# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.30 2003/07/23 22:02:30 peter Exp $
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.32 2003/07/26 03:46:39 peter Exp $
#
# Can be overridden by makeoptions or /etc/make.conf
@@ -52,9 +52,9 @@
.endif
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list