PERFORCE change 31125 for review

Peter Wemm peter at FreeBSD.org
Tue May 13 21:20:08 PDT 2003


http://perforce.freebsd.org/chv.cgi?CH=31125

Change 31125 by peter at peter_daintree on 2003/05/13 21:19:15

	IFC @31124

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#5 integrate
.. //depot/projects/hammer/sys/amd64/amd64/exception.S#13 integrate
.. //depot/projects/hammer/sys/amd64/amd64/genassym.c#13 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#34 integrate
.. //depot/projects/hammer/sys/amd64/amd64/support.S#7 integrate
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#16 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#7 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#10 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_exception.S#2 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_genassym.c#3 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_misc.c#5 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_proto.h#5 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#3 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.h#3 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_sigtramp.S#3 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_syscall.c#2 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_syscall.h#5 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_sysent.c#5 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_sysvec.c#5 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_util.h#3 integrate
.. //depot/projects/hammer/sys/amd64/ia32/syscalls.master#5 integrate
.. //depot/projects/hammer/sys/amd64/include/cpufunc.h#7 integrate
.. //depot/projects/hammer/sys/amd64/include/elf.h#8 integrate
.. //depot/projects/hammer/sys/amd64/include/md_var.h#11 integrate
.. //depot/projects/hammer/sys/amd64/include/pcb.h#9 integrate
.. //depot/projects/hammer/sys/amd64/include/segments.h#8 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#13 integrate
.. //depot/projects/hammer/sys/conf/options.amd64#9 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#5 (text+ko) ====

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.139 2003/05/12 02:37:28 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.140 2003/05/14 04:10:47 peter Exp $
  */
 
 #include <machine/asmacros.h>

==== //depot/projects/hammer/sys/amd64/amd64/exception.S#13 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.109 2003/05/12 18:33:19 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.110 2003/05/14 04:10:47 peter Exp $
  */
 
 #include <machine/asmacros.h>

==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#13 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.144 2003/05/12 18:33:19 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.145 2003/05/14 04:10:48 peter Exp $
  */
 
 #include "opt_compat.h"

==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#34 (text+ko) ====

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.576 2003/05/13 20:35:57 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.577 2003/05/14 04:10:48 peter Exp $
  */
 
 #include "opt_atalk.h"

==== //depot/projects/hammer/sys/amd64/amd64/support.S#7 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.99 2003/05/11 22:38:54 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.100 2003/05/14 03:38:13 peter Exp $
  */
 
 #include <machine/asmacros.h>

==== //depot/projects/hammer/sys/amd64/amd64/trap.c#16 (text+ko) ====

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.256 2003/05/12 18:33:19 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.257 2003/05/14 04:10:48 peter Exp $
  */
 
 /*

==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#7 (text+ko) ====

@@ -38,7 +38,7 @@
  *
  *	from: @(#)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.207 2003/05/01 01:05:22 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.208 2003/05/14 04:10:48 peter Exp $
  */
 
 #include "opt_isa.h"

==== //depot/projects/hammer/sys/amd64/conf/GENERIC#10 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.384 2003/05/09 18:26:06 peter Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.385 2003/05/14 04:10:48 peter Exp $
 
 machine		amd64
 cpu		HAMMER

==== //depot/projects/hammer/sys/amd64/ia32/ia32_exception.S#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/ia32/ia32_exception.S,v 1.1 2003/05/14 04:10:48 peter Exp $
  */
 
 #include <machine/asmacros.h>

==== //depot/projects/hammer/sys/amd64/ia32/ia32_genassym.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/amd64/ia32/ia32_genassym.c,v 1.1 2003/05/14 04:10:48 peter Exp $ */
 
 #include "opt_compat.h"
 

==== //depot/projects/hammer/sys/amd64/ia32/ia32_misc.c#5 (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/amd64/ia32/ia32_misc.c,v 1.9 2003/04/22 18:23:49 jhb Exp $
+ * $FreeBSD: src/sys/amd64/ia32/ia32_misc.c,v 1.10 2003/05/14 04:10:48 peter Exp $
  */
 
 #include "opt_compat.h"
@@ -439,6 +439,55 @@
 	return execve(td, &ap);
 }
 
+#ifdef __ia64__
+static int
+ia32_mmap_partial(struct thread *td, vm_offset_t start, vm_offset_t end,
+		  int prot, int fd, off_t pos)
+{
+	vm_map_t map;
+	vm_map_entry_t entry;
+	int rv;
+
+	map = &td->td_proc->p_vmspace->vm_map;
+	if (fd != -1)
+		prot |= VM_PROT_WRITE;
+
+	if (vm_map_lookup_entry(map, start, &entry)) {
+		if ((entry->protection & prot) != prot) {
+			rv = vm_map_protect(map,
+					    trunc_page(start),
+					    round_page(end),
+					    entry->protection | prot,
+					    FALSE);
+			if (rv != KERN_SUCCESS)
+				return (EINVAL);
+		}
+	} else {
+		vm_offset_t addr = trunc_page(start);
+		rv = vm_map_find(map, 0, 0,
+				 &addr, PAGE_SIZE, FALSE, prot,
+				 VM_PROT_ALL, 0);
+		if (rv != KERN_SUCCESS)
+			return (EINVAL);
+	}
+
+	if (fd != -1) {
+		struct pread_args r;
+		r.fd = fd;
+		r.buf = (void *) start;
+		r.nbyte = end - start;
+		r.offset = pos;
+		return (pread(td, &r));
+	} else {
+		while (start < end) {
+			subyte((void *) start, 0);
+			start++;
+		}
+		return (0);
+	}
+}
+#endif
+
 int
 ia32_mmap(struct thread *td, struct ia32_mmap_args *uap)
 {
@@ -450,7 +499,79 @@
 	int fd		 = uap->fd;
 	off_t pos	 = (uap->poslo
 			    | ((off_t)uap->poshi << 32));
+#ifdef __ia64__
+	vm_size_t pageoff;
+	int error;
+
+	/*
+	 * Attempt to handle page size hassles.
+	 */
+	pageoff = (pos & PAGE_MASK);
+	if (flags & MAP_FIXED) {
+		vm_offset_t start, end;
+		start = addr;
+		end = addr + len;
 
+		if (start != trunc_page(start)) {
+			error = ia32_mmap_partial(td, start, round_page(start),
+						  prot, fd, pos);
+			if (fd != -1)
+				pos += round_page(start) - start;
+			start = round_page(start);
+		}
+		if (end != round_page(end)) {
+			vm_offset_t t = trunc_page(end);
+			error = ia32_mmap_partial(td, t, end,
+						  prot, fd,
+						  pos + t - start);
+			end = trunc_page(end);
+		}
+		if (end > start && fd != -1 && (pos & PAGE_MASK)) {
+			/*
+			 * We can't map this region at all. The specified
+			 * address doesn't have the same alignment as the file
+			 * position. Fake the mapping by simply reading the
+			 * entire region into memory. First we need to make
+			 * sure the region exists.
+			 */
+			vm_map_t map;
+			struct pread_args r;
+			int rv;
+
+			prot |= VM_PROT_WRITE;
+			map = &td->td_proc->p_vmspace->vm_map;
+			rv = vm_map_remove(map, start, end);
+			if (rv != KERN_SUCCESS)
+				return (EINVAL);
+			rv = vm_map_find(map, 0, 0,
+					 &start, end - start, FALSE,
+					 prot, VM_PROT_ALL, 0);
+			if (rv != KERN_SUCCESS)
+				return (EINVAL);
+			r.fd = fd;
+			r.buf = (void *) start;
+			r.nbyte = end - start;
+			r.offset = pos;
+			error = pread(td, &r);
+			if (error)
+				return (error);
+
+			td->td_retval[0] = addr;
+			return (0);
+		}
+		if (end == start) {
+			/*
+			 * After dealing with the ragged ends, there
+			 * might be none left.
+			 */
+			td->td_retval[0] = addr;
+			return (0);
+		}
+		addr = start;
+		len = end - start;
+	}
+#endif
+
 	ap.addr = (void *) addr;
 	ap.len = len;
 	ap.prot = prot;
@@ -1275,3 +1396,41 @@
 	return (error);
 }
 #endif
+
+#if 0
+
+int
+ia32_xxx(struct thread *td, struct ia32_xxx_args *uap)
+{
+	int error;
+	caddr_t sg;
+	struct yyy32 *p32, s32;
+	struct yyy *p = NULL, s;
+
+	p32 = uap->zzz;
+	if (p32) {
+		sg = stackgap_init();
+		p = stackgap_alloc(&sg, sizeof(struct yyy));
+		uap->zzz = (struct yyy32 *)p;
+		error = copyin(p32, &s32, sizeof(s32));
+		if (error)
+			return (error);
+		/* translate in */
+		error = copyout(&s, p, sizeof(s));
+		if (error)
+			return (error);
+	}
+	error = xxx(td, (struct xxx_args *) uap);
+	if (error)
+		return (error);
+	if (p32) {
+		error = copyin(p, &s, sizeof(s));
+		if (error)
+			return (error);
+		/* translate out */
+		error = copyout(&s32, p32, sizeof(s32));
+	}
+	return (error);
+}
+
+#endif

==== //depot/projects/hammer/sys/amd64/ia32/ia32_proto.h#5 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
- * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.21 2003/04/25 15:59:18 jhb Exp 
+ * $FreeBSD: src/sys/amd64/ia32/ia32_proto.h,v 1.10 2003/05/14 04:11:25 peter Exp $
+ * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.22 2003/05/14 04:10:49 peter Exp 
  */
 
 #ifndef _IA32_SYSPROTO_H_

==== //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/ia64/ia32/ia32_sysvec.c,v 1.2 2002/09/01 21:41:23 jake Exp $
+ * $FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.1 2003/05/14 04:10:48 peter Exp $
  */
 
 #include "opt_compat.h"

==== //depot/projects/hammer/sys/amd64/ia32/ia32_signal.h#3 (text+ko) ====

@@ -26,7 +26,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$
+ * $FreeBSD: src/sys/amd64/ia32/ia32_signal.h,v 1.1 2003/05/14 04:10:48 peter Exp $
  */
 
 struct ia32_sigaltstack {

==== //depot/projects/hammer/sys/amd64/ia32/ia32_sigtramp.S#3 (text+ko) ====

@@ -1,10 +1,7 @@
 /*-
- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 2003 Peter Wemm
  * All rights reserved.
  *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,18 +10,11 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -33,14 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- * $FreeBSD: src/sys/i386/i386/locore.s,v 1.171 2003/04/03 23:44:34 jake Exp $
- *
- *		originally from: locore.s, by William F. Jolitz
- *
- *		Substantially rewritten by David Greenman, Rod Grimes,
- *			Bruce Evans, Wolfgang Solfrank, Poul-Henning Kamp
- *			and many others.
+ * $FreeBSD: src/sys/amd64/ia32/ia32_sigtramp.S,v 1.1 2003/05/14 04:10:48 peter Exp $
  */
 
 #include "opt_compat.h"

==== //depot/projects/hammer/sys/amd64/ia32/ia32_syscall.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.1 2003/05/14 04:10:48 peter Exp $
  */
 
 /*

==== //depot/projects/hammer/sys/amd64/ia32/ia32_syscall.h#5 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
- * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.21 2003/04/25 15:59:18 jhb Exp 
+ * $FreeBSD: src/sys/amd64/ia32/ia32_syscall.h,v 1.10 2003/05/14 04:11:25 peter Exp $
+ * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.22 2003/05/14 04:10:49 peter Exp 
  */
 
 #define	IA32_SYS_syscall	0

==== //depot/projects/hammer/sys/amd64/ia32/ia32_sysent.c#5 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
- * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.21 2003/04/25 15:59:18 jhb Exp 
+ * $FreeBSD: src/sys/amd64/ia32/ia32_sysent.c,v 1.11 2003/05/14 04:11:25 peter Exp $
+ * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.22 2003/05/14 04:10:49 peter Exp 
  */
 
 #include "opt_compat.h"

==== //depot/projects/hammer/sys/amd64/ia32/ia32_sysvec.c#5 (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/amd64/ia32/ia32_sysvec.c,v 1.2 2002/09/01 21:41:23 jake Exp $
+ * $FreeBSD: src/sys/amd64/ia32/ia32_sysvec.c,v 1.3 2003/05/14 04:10:48 peter Exp $
  */
 
 #include "opt_compat.h"

==== //depot/projects/hammer/sys/amd64/ia32/ia32_util.h#3 (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/amd64/ia32/ia32_util.h,v 1.4 2002/12/14 01:56:25 alfred Exp $
+ * $FreeBSD: src/sys/amd64/ia32/ia32_util.h,v 1.5 2003/05/14 04:10:49 peter Exp $
  */
 
 #include <vm/vm.h>
@@ -44,6 +44,9 @@
 	int	ps_nenvstr;	/* the number of environment strings */
 };
 
+#define IA32_USRSTACK	USRSTACK
+#define IA32_PS_STRINGS	(IA32_USRSTACK - sizeof(struct ia32_ps_strings))
+
 static __inline caddr_t stackgap_init(void);
 static __inline void *stackgap_alloc(caddr_t *, size_t);
 
@@ -51,7 +54,7 @@
 stackgap_init()
 {
 #define	szsigcode (*(curproc->p_sysent->sv_szsigcode))
-	return (caddr_t)(((caddr_t)PS_STRINGS) - szsigcode - SPARE_USRSPACE);
+	return (caddr_t)(((caddr_t)IA32_PS_STRINGS) - szsigcode - SPARE_USRSPACE);
 #undef szsigcode
 }
 

==== //depot/projects/hammer/sys/amd64/ia32/syscalls.master#5 (text+ko) ====

@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.21 2003/04/25 15:59:18 jhb Exp $
+ $FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.22 2003/05/14 04:10:49 peter Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;	from: src/sys/kern/syscalls.master 1.107
 ;

==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#7 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.134 2003/05/01 01:05:23 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.135 2003/05/14 04:10:49 peter Exp $
  */
 
 /*

==== //depot/projects/hammer/sys/amd64/include/elf.h#8 (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/amd64/include/elf.h,v 1.14 2003/05/01 01:05:23 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/elf.h,v 1.15 2003/05/14 04:10:49 peter Exp $
  */
 
 #ifndef _MACHINE_ELF_H_

==== //depot/projects/hammer/sys/amd64/include/md_var.h#11 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.65 2003/05/11 22:53:43 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.66 2003/05/14 04:10:49 peter Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_

==== //depot/projects/hammer/sys/amd64/include/pcb.h#9 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.51 2003/05/12 02:37:29 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.52 2003/05/14 04:10:49 peter Exp $
  */
 
 #ifndef _I386_PCB_H_

==== //depot/projects/hammer/sys/amd64/include/segments.h#8 (text+ko) ====

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/segments.h,v 1.34 2003/05/01 01:05:23 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/segments.h,v 1.35 2003/05/14 04:10:49 peter Exp $
  */
 
 #ifndef _MACHINE_SEGMENTS_H_

==== //depot/projects/hammer/sys/conf/files.amd64#13 (text+ko) ====

@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD: src/sys/conf/files.amd64,v 1.13 2003/05/03 03:30:29 peter Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.14 2003/05/14 04:10:49 peter Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and

==== //depot/projects/hammer/sys/conf/options.amd64#9 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.amd64,v 1.6 2003/05/01 02:59:24 peter Exp $
+# $FreeBSD: src/sys/conf/options.amd64,v 1.7 2003/05/14 04:10:49 peter Exp $
 # Options specific to the AMD x86-64 platform kernels
 
 MAXMEM


More information about the p4-projects mailing list