PERFORCE change 65954 for review

Marcel Moolenaar marcel at FreeBSD.org
Sat Nov 27 16:39:57 PST 2004 

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

Change 65954 by marcel at marcel_nfs on 2004/11/28 00:39:33

	IFC @65953

Affected files ...

.. //depot/projects/ia64/games/fortune/datfiles/fortunes#42 integrate
.. //depot/projects/ia64/lib/libc/alpha/gen/divrem.m4#2 integrate
.. //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#20 integrate
.. //depot/projects/ia64/lib/libc_r/uthread/uthread_init.c#12 integrate
.. //depot/projects/ia64/lib/libc_r/uthread/uthread_jmp.c#2 integrate
.. //depot/projects/ia64/lib/libc_r/uthread/uthread_stack.c#4 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_init.c#14 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_private.h#18 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_stack.c#4 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#86 integrate
.. //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#7 integrate
.. //depot/projects/ia64/sbin/swapon/swapon.c#12 integrate
.. //depot/projects/ia64/share/man/man4/Makefile#77 integrate
.. //depot/projects/ia64/share/man/man4/snd_ich.4#1 branch
.. //depot/projects/ia64/sys/alpha/alpha/db_trace.c#11 integrate
.. //depot/projects/ia64/sys/alpha/alpha/divrem.m4#2 integrate
.. //depot/projects/ia64/sys/alpha/alpha/fp_emulate.c#5 integrate
.. //depot/projects/ia64/sys/alpha/alpha/machdep.c#46 integrate
.. //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#20 integrate
.. //depot/projects/ia64/sys/alpha/alpha/pmap.c#52 integrate
.. //depot/projects/ia64/sys/alpha/alpha/prom.c#10 integrate
.. //depot/projects/ia64/sys/alpha/alpha/sys_machdep.c#12 integrate
.. //depot/projects/ia64/sys/alpha/alpha/trap.c#33 integrate
.. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#32 integrate
.. //depot/projects/ia64/sys/alpha/linux/linux_machdep.c#14 integrate
.. //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#24 integrate
.. //depot/projects/ia64/sys/alpha/osf1/osf1_signal.c#19 integrate
.. //depot/projects/ia64/sys/amd64/amd64/fpu.c#7 integrate
.. //depot/projects/ia64/sys/amd64/amd64/machdep.c#27 integrate
.. //depot/projects/ia64/sys/amd64/amd64/pmap.c#43 integrate
.. //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#19 integrate
.. //depot/projects/ia64/sys/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/ia64/sys/arm/arm/db_trace.c#6 integrate
.. //depot/projects/ia64/sys/arm/arm/trap.c#4 integrate
.. //depot/projects/ia64/sys/arm/arm/undefined.c#3 integrate
.. //depot/projects/ia64/sys/arm/arm/vm_machdep.c#5 integrate
.. //depot/projects/ia64/sys/boot/efi/include/efilib.h#5 integrate
.. //depot/projects/ia64/sys/boot/efi/libefi/Makefile#11 integrate
.. //depot/projects/ia64/sys/boot/efi/libefi/copy.c#4 integrate
.. //depot/projects/ia64/sys/boot/ia64/efi/Makefile#2 integrate
.. //depot/projects/ia64/sys/boot/ia64/efi/efimd.c#1 branch
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_misc.c#11 integrate
.. //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#20 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#30 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_pci_link.c#20 integrate
.. //depot/projects/ia64/sys/i386/i386/machdep.c#58 integrate
.. //depot/projects/ia64/sys/i386/i386/pmap.c#82 integrate
.. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#25 integrate
.. //depot/projects/ia64/sys/i386/i386/vm86.c#13 integrate
.. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#40 integrate
.. //depot/projects/ia64/sys/i386/isa/npx.c#26 integrate
.. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#32 integrate
.. //depot/projects/ia64/sys/ia64/ia64/machdep.c#113 integrate
.. //depot/projects/ia64/sys/ia64/ia64/trap.c#76 integrate
.. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#43 integrate
.. //depot/projects/ia64/sys/kern/imgact_aout.c#21 integrate
.. //depot/projects/ia64/sys/kern/init_main.c#46 integrate
.. //depot/projects/ia64/sys/kern/kern_exec.c#69 integrate
.. //depot/projects/ia64/sys/kern/kern_exit.c#59 integrate
.. //depot/projects/ia64/sys/kern/kern_fork.c#56 integrate
.. //depot/projects/ia64/sys/kern/kern_proc.c#58 integrate
.. //depot/projects/ia64/sys/kern/kern_synch.c#57 integrate
.. //depot/projects/ia64/sys/kern/sys_process.c#30 integrate
.. //depot/projects/ia64/sys/netgraph/ng_ppp.c#15 integrate
.. //depot/projects/ia64/sys/netinet/tcp.h#8 integrate
.. //depot/projects/ia64/sys/netinet/tcp_usrreq.c#21 integrate
.. //depot/projects/ia64/sys/pc98/i386/machdep.c#48 integrate
.. //depot/projects/ia64/sys/powerpc/powerpc/db_trace.c#7 integrate
.. //depot/projects/ia64/sys/powerpc/powerpc/fpu.c#5 integrate
.. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#40 integrate
.. //depot/projects/ia64/sys/powerpc/powerpc/mp_machdep.c#4 integrate
.. //depot/projects/ia64/sys/powerpc/powerpc/trap.c#29 integrate
.. //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#31 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/db_trace.c#14 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#55 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/rwindow.c#6 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#35 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#39 integrate
.. //depot/projects/ia64/sys/sys/user.h#16 integrate
.. //depot/projects/ia64/sys/vm/vm_glue.c#46 integrate
.. //depot/projects/ia64/usr.bin/gcore/Makefile#4 integrate
.. //depot/projects/ia64/usr.bin/gcore/aoutcore.c#4 delete
.. //depot/projects/ia64/usr.bin/ktrace/subr.c#6 integrate
.. //depot/projects/ia64/usr.sbin/pstat/pstat.c#17 integrate

Differences ...

==== //depot/projects/ia64/games/fortune/datfiles/fortunes#42 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.146 2004/10/27 20:28:56 wilko Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.147 2004/11/27 08:28:58 dds Exp $
 
 %
 			-- Gifts for Children --
@@ -1063,6 +1063,10 @@
 If you're wearing a shirt that's red.
 		-- Doris Robin and Karen Trimble of The L.A. Filkharmonics
 %
+The Ken Thompson school of thought on expert systems:
+there's table lookup, fraud, and grand fraud.
+		-- Andrew Hume
+%
 	THE LESSER-KNOWN PROGRAMMING LANGUAGES #10: SIMPLE
 
 SIMPLE is an acronym for Sheer Idiot's Monopurpose Programming Language

==== //depot/projects/ia64/lib/libc/alpha/gen/divrem.m4#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*	$NetBSD: divrem.m4,v 1.7 1996/10/17 03:08:04 cgd Exp $	*/
-/* $FreeBSD: src/lib/libc/alpha/gen/divrem.m4,v 1.3 2000/05/10 19:04:57 obrien Exp $ */
+/* $FreeBSD: src/lib/libc/alpha/gen/divrem.m4,v 1.4 2004/11/27 20:59:49 peadar Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -172,7 +172,7 @@
 ifelse(S, `true',
 `
 	/* Check to see if we should negate it. */
-	subqv	zero, RESULT, T_0
+	subq	zero, RESULT, T_0
 	cmovlbs	NEG, T_0, RESULT
 ')
 

==== //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#20 (text+ko) ====

@@ -31,7 +31,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.82 2004/01/22 19:15:08 deischen Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.83 2004/11/27 06:51:31 das Exp $
  */
 
 #ifndef _PTHREAD_PRIVATE_H
@@ -52,6 +52,7 @@
 #include <setjmp.h>
 #include <signal.h>
 #include <stdio.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -60,6 +61,10 @@
 #include <spinlock.h>
 #include <ucontext.h>
 #include <pthread_np.h>
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
 
 /*
  * Define machine dependent macros to get and set the stack pointer

==== //depot/projects/ia64/lib/libc_r/uthread/uthread_init.c#12 (text+ko) ====

@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.46 2003/12/03 06:54:40 peter Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.47 2004/11/27 06:51:31 das Exp $
  */
 
 /* Allocate space for global thread variables here: */
@@ -49,7 +49,6 @@
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/ttycom.h>
-#include <sys/user.h>
 #include <sys/wait.h>
 #include <sys/mman.h>
 #include <dirent.h>

==== //depot/projects/ia64/lib/libc_r/uthread/uthread_jmp.c#2 (text+ko) ====

@@ -28,13 +28,12 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libc_r/uthread/uthread_jmp.c,v 1.9 2001/10/10 17:48:43 bde Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_jmp.c,v 1.10 2004/11/27 06:51:31 das Exp $
  */
 
 #include <unistd.h>
 #include <setjmp.h>
 #include <sys/param.h>
-#include <sys/user.h>
 #include <machine/reg.h>
 #include <pthread.h>
 #include "pthread_private.h"

==== //depot/projects/ia64/lib/libc_r/uthread/uthread_stack.c#4 (text+ko) ====

@@ -24,14 +24,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libc_r/uthread/uthread_stack.c,v 1.5 2002/11/13 18:13:26 deischen Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_stack.c,v 1.6 2004/11/27 06:51:31 das Exp $
  */
 #include "namespace.h"
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/param.h>
 #include <sys/queue.h>
-#include <sys/user.h>
 #include <stdlib.h>
 #include <pthread.h>
 #include "un-namespace.h"

==== //depot/projects/ia64/lib/libthr/thread/thr_init.c#14 (text+ko) ====

@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.17 2004/06/27 10:01:35 mtm Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.18 2004/11/27 06:51:31 das Exp $
  */
 
 /* Allocate space for global thread variables here: */
@@ -49,7 +49,6 @@
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/ttycom.h>
-#include <sys/user.h>
 #include <sys/wait.h>
 #include <sys/mman.h>
 #include <dirent.h>

==== //depot/projects/ia64/lib/libthr/thread/thr_private.h#18 (text+ko) ====

@@ -31,7 +31,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.41 2004/09/16 13:55:46 mtm Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.42 2004/11/27 06:51:31 das Exp $
  */
 
 #ifndef _THR_PRIVATE_H
@@ -54,6 +54,7 @@
 #include <sys/errno.h>
 #include <sys/msg.h>
 #include <sys/time.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <pthread_np.h>
 #include <sched.h>
@@ -69,6 +70,10 @@
 #include <machine/atomic.h>
 #include <sys/thr.h>
 #include <sys/umtx.h>
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
 
 #if defined(_PTHREADS_INVARIANTS)
 /*

==== //depot/projects/ia64/lib/libthr/thread/thr_stack.c#4 (text+ko) ====

@@ -24,13 +24,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_stack.c,v 1.3 2003/05/26 00:37:07 mtm Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_stack.c,v 1.4 2004/11/27 06:51:31 das Exp $
  */
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/param.h>
 #include <sys/queue.h>
-#include <sys/user.h>
 #include <stdlib.h>
 #include <pthread.h>
 #include "thr_private.h"

==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#86 (text+ko) ====

@@ -29,7 +29,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.262 2004/11/20 02:46:02 brueffer Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.263 2004/11/27 13:57:22 simon Exp $</pubdate>
   </sect1info>
 
   <title>Supported Devices</title>
@@ -804,6 +804,8 @@
 
     &hwlist.snd.ds1;
 
+    &hwlist.snd.ich;
+
     <para arch="pc98">NEC PC-9801-73, 86 and compatibles (nss driver)
       <itemizedlist>
         <listitem>

==== //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#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/release/doc/share/misc/dev.archlist.txt,v 1.45 2004/11/20 02:44:47 brueffer Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.46 2004/11/27 13:57:22 simon Exp $
 #
 
 #
@@ -105,6 +105,7 @@
 snd_es137x	i386,amd64
 snd_ess	i386,amd64
 snd_gusc	i386,amd64
+snd_ich	i386,amd64
 snd_solo	i386,amd64
 ste	i386,pc98,alpha,amd64
 stg	i386,pc98

==== //depot/projects/ia64/sbin/swapon/swapon.c#12 (text+ko) ====

@@ -39,12 +39,12 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/swapon/swapon.c,v 1.20 2004/04/09 19:58:39 markm Exp $");
+__FBSDID("$FreeBSD: src/sbin/swapon/swapon.c,v 1.21 2004/11/27 06:51:31 das Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
-#include <sys/user.h>
 #include <sys/sysctl.h>
+#include <vm/vm_param.h>
 
 #include <err.h>
 #include <errno.h>

==== //depot/projects/ia64/share/man/man4/Makefile#77 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.294 2004/11/24 20:31:30 brueffer Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.295 2004/11/27 13:49:27 simon Exp $
 
 MAN=	aac.4 \
 	acpi.4 \
@@ -267,6 +267,7 @@
 	snd_es137x.4 \
 	snd_ess.4 \
 	snd_gusc.4 \
+	snd_ich.4 \
 	snd_maestro3.4 \
 	snd_sbc.4 \
 	snd_solo.4 \

==== //depot/projects/ia64/sys/alpha/alpha/db_trace.c#11 (text+ko) ====

@@ -42,17 +42,17 @@
 
 #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.22 2004/11/01 22:15:13 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.23 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kdb.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/sysent.h>
 
 #include <machine/db_machdep.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 
 #include <ddb/ddb.h>
 #include <ddb/db_sym.h> 

==== //depot/projects/ia64/sys/alpha/alpha/divrem.m4#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/alpha/divrem.m4,v 1.3 2000/05/01 20:17:45 peter Exp $ */
+/* $FreeBSD: src/sys/alpha/alpha/divrem.m4,v 1.4 2004/11/27 20:59:49 peadar Exp $ */
 /*	$NetBSD: divrem.m4,v 1.5 1996/10/17 04:26:25 cgd Exp $	*/
 
 /*
@@ -172,7 +172,7 @@
 ifelse(S, `true',
 `
 	/* Check to see if we should negate it. */
-	subqv	zero, RESULT, T_0
+	subq	zero, RESULT, T_0
 	cmovlbs	NEG, T_0, RESULT
 ')
 

==== //depot/projects/ia64/sys/alpha/alpha/fp_emulate.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.14 2004/05/06 09:35:57 das Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.15 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -34,7 +34,6 @@
 #include <sys/proc.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
@@ -47,6 +46,7 @@
 #include <machine/fpu.h>
 #include <machine/inst.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/reg.h>
 
 #include <alpha/alpha/ieee_float.h>

==== //depot/projects/ia64/sys/alpha/alpha/machdep.c#46 (text+ko) ====

@@ -88,7 +88,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.225 2004/11/20 02:29:36 das Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.226 2004/11/27 06:51:32 das Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
@@ -132,7 +132,6 @@
 #include <vm/vm_extern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>
-#include <sys/user.h>
 #include <sys/ptrace.h>
 #include <sys/ucontext.h>
 #include <machine/clock.h>
@@ -141,6 +140,7 @@
 #include <machine/pal.h>
 #include <machine/cpuconf.h>
 #include <machine/bootinfo.h>
+#include <machine/pcb.h>
 #include <machine/rpb.h>
 #include <machine/prom.h>
 #include <machine/chipset.h>

==== //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#20 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.54 2004/11/20 02:29:36 das Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.55 2004/11/27 06:51:32 das Exp $");
 
 #include "opt_kstack_pages.h"
 
@@ -42,7 +42,6 @@
 #include <sys/smp.h>
 #include <sys/sysctl.h>
 #include <sys/bus.h>
-#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
@@ -51,6 +50,7 @@
 #include <machine/atomic.h>
 #include <machine/clock.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/pmap.h>
 #include <machine/prom.h>
 #include <machine/rpb.h>

==== //depot/projects/ia64/sys/alpha/alpha/pmap.c#52 (text+ko) ====

@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.173 2004/10/03 00:16:42 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.174 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -173,9 +173,8 @@
 #include <vm/vm_pager.h>
 #include <vm/uma.h>
 
-#include <sys/user.h>
-
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/rpb.h>
 
 #ifndef PMAP_SHPGPERPROC

==== //depot/projects/ia64/sys/alpha/alpha/prom.c#10 (text+ko) ====

@@ -26,7 +26,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 /* __KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.22 1998/02/27 04:03:00 thorpej Exp $"); */
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/prom.c,v 1.28 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/prom.c,v 1.29 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -35,10 +35,10 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/cons.h>
 
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/prom.h>
 #include <machine/rpb.h>
 #include <machine/vmparam.h>

==== //depot/projects/ia64/sys/alpha/alpha/sys_machdep.c#12 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.27 2004/04/05 21:00:49 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.28 2004/11/27 06:51:32 das Exp $");
 
 #include "opt_mac.h"
 
@@ -42,7 +42,6 @@
 #include <sys/proc.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
@@ -50,6 +49,7 @@
 #include <vm/vm_extern.h>
 
 #include <machine/cpu.h>
+#include <machine/pcb.h>
 #include <machine/sysarch.h>
 
 #include <vm/vm_kern.h>		/* for kernel_map */

==== //depot/projects/ia64/sys/alpha/alpha/trap.c#33 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.120 2004/08/31 07:34:53 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.121 2004/11/27 06:51:32 das Exp $");
 
 /* #include "opt_fix_unaligned_vax_fp.h" */
 #include "opt_ddb.h"
@@ -55,12 +55,12 @@
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_param.h>
-#include <sys/user.h>
 #include <sys/ptrace.h>
 #include <machine/clock.h>
 #include <machine/md_var.h>
 #include <machine/reg.h>
 #include <machine/pal.h>
+#include <machine/pcb.h>
 #include <machine/fpu.h>
 
 #ifdef KTRACE

==== //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#32 (text+ko) ====

@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.104 2004/05/26 12:09:36 tmm Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.105 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,6 +89,7 @@
 #include <machine/cpu.h>
 #include <machine/fpu.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/prom.h>
 
 #include <vm/vm.h>
@@ -99,8 +100,6 @@
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
-#include <sys/user.h>
-
 /*
  * Finish a fork operation, with process p2 nearly set up.
  * Copy and update the pcb, set up the stack so that the child

==== //depot/projects/ia64/sys/alpha/linux/linux_machdep.c#14 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.34 2004/09/01 02:11:27 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.35 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -36,10 +36,13 @@
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
+#include <sys/resource.h>
+#include <sys/resourcevar.h>
 #include <sys/syscallsubr.h>
 #include <sys/sysproto.h>
 #include <sys/unistd.h>
-#include <sys/user.h>
+
+#include <machine/pcb.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>

==== //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#24 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.50 2004/10/14 10:43:47 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.51 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -66,7 +66,6 @@
 #include <sys/sysproto.h>
 #include <sys/systm.h>
 #include <sys/unistd.h>
-#include <sys/user.h>
 #include <sys/utsname.h>
 #include <sys/vnode.h>
 #include <sys/wait.h>
@@ -82,6 +81,7 @@
 #include <machine/cpuconf.h>
 #include <machine/fpu.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/rpb.h>
 
 #include <alpha/osf1/exec_ecoff.h>

==== //depot/projects/ia64/sys/alpha/osf1/osf1_signal.c#19 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.36 2004/01/03 23:36:31 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.37 2004/11/27 06:51:32 das Exp $");
 
 #include "opt_compat.h"
 #ifndef COMPAT_43
@@ -66,7 +66,6 @@
 #include <vm/vm_extern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>
-#include <sys/user.h>
 #include <sys/ptrace.h>
 #include <sys/cons.h>
 #include <machine/clock.h>
@@ -83,6 +82,7 @@
 #include <ddb/ddb.h>
 #include <alpha/alpha/db_instruction.h>
 #include <sys/vnode.h>
+#include <machine/pcb.h>
 
 #include <alpha/osf1/osf1_signal.h>
 #include <alpha/osf1/osf1_proto.h>

==== //depot/projects/ia64/sys/amd64/amd64/fpu.c#7 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.154 2004/06/18 04:01:54 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.155 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -47,7 +47,6 @@
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <sys/signalvar.h>
-#include <sys/user.h>
 
 #include <machine/cputypes.h>
 #include <machine/frame.h>

==== //depot/projects/ia64/sys/amd64/amd64/machdep.c#27 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.623 2004/11/20 02:29:23 das Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.624 2004/11/27 06:51:32 das Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
@@ -82,6 +82,8 @@
 #include <sys/bus.h>
 #include <sys/eventhandler.h>
 
+#include <machine/pcb.h>
+
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_kern.h>
@@ -91,7 +93,6 @@
 #include <vm/vm_pager.h>
 #include <vm/vm_extern.h>
 
-#include <sys/user.h>
 #include <sys/exec.h>
 #include <sys/cons.h>
 

==== //depot/projects/ia64/sys/amd64/amd64/pmap.c#43 (text+ko) ====

@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.508 2004/10/08 08:23:42 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.509 2004/11/27 06:51:33 das Exp $");
 
 /*
  *	Manages physical address maps.
@@ -116,7 +116,6 @@
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/sx.h>
-#include <sys/user.h>
 #include <sys/vmmeter.h>
 #include <sys/sched.h>
 #include <sys/sysctl.h>
@@ -138,6 +137,7 @@
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/specialreg.h>
 #ifdef SMP
 #include <machine/smp.h>

==== //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#19 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.237 2004/08/16 22:57:13 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.238 2004/11/27 06:51:34 das Exp $");
 
 #include "opt_isa.h"
 #include "opt_cpu.h"
@@ -62,7 +62,6 @@
 #include <sys/smp.h>
 #include <sys/sysctl.h>
 #include <sys/unistd.h>
-#include <sys/user.h>
 #include <sys/vnode.h>
 #include <sys/vmmeter.h>
 

==== //depot/projects/ia64/sys/amd64/linux32/linux32_sysvec.c#2 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.3 2004/08/16 11:15:46 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.4 2004/11/27 06:51:34 das Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
@@ -56,12 +56,12 @@
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
+#include <sys/resourcevar.h>
 #include <sys/signalvar.h>
 #include <sys/sysctl.h>
 #include <sys/syscallsubr.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <sys/user.h>
 #include <sys/vnode.h>
 
 #include <vm/vm.h>
@@ -74,6 +74,7 @@
 
 #include <machine/cpu.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/specialreg.h>
 
 #include <amd64/linux32/linux.h>

==== //depot/projects/ia64/sys/arm/arm/db_trace.c#6 (text+ko) ====

@@ -30,18 +30,18 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.8 2004/11/21 19:41:27 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.9 2004/11/27 06:51:34 das Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 
 
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/kdb.h>
 #include <machine/armreg.h>
 #include <machine/asm.h>
 #include <machine/cpufunc.h>
 #include <machine/db_machdep.h>
+#include <machine/pcb.h>
 #include <machine/vmparam.h>
 #include <ddb/ddb.h>
 #include <ddb/db_access.h>

==== //depot/projects/ia64/sys/arm/arm/trap.c#4 (text+ko) ====

@@ -82,14 +82,13 @@
 #include "opt_ktrace.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.4 2004/11/20 00:55:57 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.5 2004/11/27 06:51:34 das Exp $");
 
 #include <sys/types.h>
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
@@ -112,6 +111,7 @@
 #include <machine/katelib.h>
 #include <machine/cpu.h>
 #include <machine/intr.h>
+#include <machine/pcb.h>
 #include <machine/proc.h>
 #include <machine/swi.h>
 #if !defined(DDB)

==== //depot/projects/ia64/sys/arm/arm/undefined.c#3 (text+ko) ====

@@ -48,7 +48,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.3 2004/11/21 18:11:39 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.4 2004/11/27 06:51:34 das Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -56,7 +56,6 @@
 #include <sys/signal.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/syslog.h>
 #include <sys/vmmeter.h>
 #include <sys/types.h>

==== //depot/projects/ia64/sys/arm/arm/vm_machdep.c#5 (text+ko) ====

@@ -81,7 +81,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.8 2004/11/20 16:51:32 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.9 2004/11/27 06:51:34 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -91,7 +91,6 @@
 #include <sys/proc.h>
 #include <sys/socketvar.h>
 #include <sys/sf_buf.h>
-#include <sys/user.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
 #include <vm/vm.h>

==== //depot/projects/ia64/sys/boot/efi/include/efilib.h#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/boot/efi/include/efilib.h,v 1.3 2002/12/10 20:11:19 marcel Exp $
+ *	$FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.4 2004/11/28 00:30:22 marcel Exp $
  */
 
 extern EFI_HANDLE		IH;
@@ -34,5 +34,7 @@
 void *efi_get_table(EFI_GUID *tbl);
 void efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table);
 
+EFI_PHYSICAL_ADDRESS efimd_va2pa(EFI_VIRTUAL_ADDRESS);
+
 EFI_STATUS main(int argc, CHAR16 *argv[]);
 void exit(EFI_STATUS status);

==== //depot/projects/ia64/sys/boot/efi/libefi/Makefile#11 (text+ko) ====

@@ -1,26 +1,26 @@
-# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.15 2004/10/24 15:32:49 ru Exp $
+# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.16 2004/11/28 00:30:22 marcel Exp $
 
 .PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH}
 
-LIB=		efi
+LIB=	efi
 INTERNALLIB=
 
-SRCS=	libefi.c efi_console.c time.c copy.c devicename.c module.c
-SRCS+=	delay.c efifs.c efinet.c elf_freebsd.c bootinfo.c pal.S
+SRCS=	bootinfo.c copy.c delay.c devicename.c efi_console.c efifs.c efinet.c \
+	elf_freebsd.c libefi.c module.c time.c
 
 .if ${MACHINE_ARCH} == "ia64"
-SRCS+=	efifpswa.c
+SRCS+=	efifpswa.c pal.S
 .endif
 
-CFLAGS+=	-I${.CURDIR}/../include
-CFLAGS+=	-I${.CURDIR}/../include/${MACHINE_ARCH}
-CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand
+CFLAGS+= -I${.CURDIR}/../include
+CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH}
+CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
 
 # Pick up the bootstrap header for some interface items
-CFLAGS+=	-I${.CURDIR}/../../common
+CFLAGS+= -I${.CURDIR}/../../common
 
+# Make the disk code more talkative
 .if defined(BOOT_DISK_DEBUG)
-# Make the disk code more talkative
 CFLAGS+= -DDISK_DEBUG
 .endif
 

==== //depot/projects/ia64/sys/boot/efi/libefi/copy.c#4 (text+ko) ====

@@ -25,44 +25,31 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/copy.c,v 1.5 2003/04/03 21:36:29 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/copy.c,v 1.6 2004/11/28 00:30:22 marcel Exp $");
 
-/*
- * MD primitives supporting placement of module data 
- */
-#include <stand.h>

>>> TRUNCATED FOR MAIL (1000 lines) <<<

More information about the p4-projects mailing list