[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

Fri Mar 2 15:39:33 UTC 2012

details:   http://zrouter.org/hg/FreeBSD/head//rev/184bff40393f
changeset: 390:184bff40393f
user:      ray at terran.dlink.ua
date:      Fri Mar 02 17:14:20 2012 +0200
description:
Update to FreeBSD-HEAD @232391

diffstat:

 head/sys/ia64/ia64/busdma_machdep.c |  8 ++++----
 head/sys/ia64/ia64/machdep.c        |  4 ++--
 head/sys/ia64/ia64/vm_machdep.c     |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diffs (81 lines):

diff -r eaa303571293 -r 184bff40393f head/sys/ia64/ia64/busdma_machdep.c

--- a/head/sys/ia64/ia64/busdma_machdep.c	Fri Mar 02 17:14:11 2012 +0200
+++ b/head/sys/ia64/ia64/busdma_machdep.c	Fri Mar 02 17:14:20 2012 +0200
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/ia64/ia64/busdma_machdep.c 227309 2011-11-07 15:43:11Z ed $");
+__FBSDID("$FreeBSD: head/sys/ia64/ia64/busdma_machdep.c 232356 2012-03-01 19:58:34Z jhb $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -53,7 +53,7 @@
 struct bus_dma_tag {
 	bus_dma_tag_t	parent;
 	bus_size_t	alignment;
-	bus_size_t	boundary;
+	bus_addr_t	boundary;
 	bus_addr_t	lowaddr;
 	bus_addr_t	highaddr;
 	bus_dma_filter_t *filter;
@@ -139,7 +139,7 @@
 static __inline int
 run_filter(bus_dma_tag_t dmat, bus_addr_t paddr, bus_size_t len)
 {
-	bus_size_t bndy;
+	bus_addr_t bndy;
 	int retval;
 
 	retval = 0;
@@ -199,7 +199,7 @@
  */
 int
 bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
-    bus_size_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr,
+    bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr,
     bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize,
     int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc,
     void *lockfuncarg, bus_dma_tag_t *dmat)
diff -r eaa303571293 -r 184bff40393f head/sys/ia64/ia64/machdep.c
--- a/head/sys/ia64/ia64/machdep.c	Fri Mar 02 17:14:11 2012 +0200
+++ b/head/sys/ia64/ia64/machdep.c	Fri Mar 02 17:14:20 2012 +0200
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/ia64/ia64/machdep.c 227309 2011-11-07 15:43:11Z ed $");
+__FBSDID("$FreeBSD: head/sys/ia64/ia64/machdep.c 232250 2012-02-28 13:19:34Z gavin $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
@@ -245,7 +245,7 @@
 
 	printf("CPU: %s (", model_name);
 	if (cpu_freq)
-		printf("%u Mhz ", cpu_freq);
+		printf("%u MHz ", cpu_freq);
 	printf("%s)\n", family_name);
 	printf("  Origin = \"%s\"  Revision = %d\n", vendor, revision);
 	printf("  Features = 0x%b\n", (u_int32_t) features,
diff -r eaa303571293 -r 184bff40393f head/sys/ia64/ia64/vm_machdep.c
--- a/head/sys/ia64/ia64/vm_machdep.c	Fri Mar 02 17:14:11 2012 +0200
+++ b/head/sys/ia64/ia64/vm_machdep.c	Fri Mar 02 17:14:20 2012 +0200
@@ -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$
+ * $FreeBSD: head/sys/ia64/ia64/vm_machdep.c 231177 2012-02-08 04:05:38Z marcel $
  */
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -192,7 +192,7 @@
 	bcopy(td0->td_pcb, pcb, sizeof(*pcb));
 	pcb->pcb_special.bspstore = td->td_kstack;
 	pcb->pcb_special.pfs = 0;
-	pcb->pcb_current_pmap = vmspace_pmap(td->td_proc->p_vmspace);
+	pcb->pcb_current_pmap = vmspace_pmap(td0->td_proc->p_vmspace);
 	pcb->pcb_special.sp = (uintptr_t)tf - 16;
 	pcb->pcb_special.rp = FDESC_FUNC(fork_trampoline);
 	cpu_set_fork_handler(td, (void (*)(void*))fork_return, td);
