Date: Wed, 20 Aug 2008 10:40:11 GMT From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 147911 for review Message-ID: <200808201040.m7KAeBwe051062@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=147911 Change 147911 by ed@ed_dull on 2008/08/20 10:39:13 IFC again. I've just deleted grantpt.c as well. Affected files ... .. //depot/projects/mpsafetty/sys/dev/xen/console/console.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/xen/netfront/netfront.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/conf/XEN#2 integrate Differences ... ==== //depot/projects/mpsafetty/sys/dev/xen/console/console.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/xen/console/console.c,v 1.3 2008/08/20 09:03:03 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/xen/console/console.c,v 1.4 2008/08/20 09:47:49 kmacy Exp $"); #include <sys/param.h> #include <sys/module.h> @@ -376,12 +376,12 @@ tty_lock(tp); while ((c = xccncheckc(NULL)) != -1) ttydisc_rint(tp, c, 0); - tty_unlock(tp); if (xc_start_needed) { xc_start_needed = FALSE; xcoutwakeup(tp); } + tty_unlock(tp); callout_reset(&xc_callout, XC_POLLTIME, xc_timeout, tp); } ==== //depot/projects/mpsafetty/sys/dev/xen/netfront/netfront.c#3 (text+ko) ==== @@ -18,7 +18,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/xen/netfront/netfront.c,v 1.3 2008/08/20 09:11:58 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/xen/netfront/netfront.c,v 1.4 2008/08/20 09:47:49 kmacy Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -148,7 +148,7 @@ * not the other way around. The size must track the free index arrays. */ struct xn_chain_data { - struct mbuf *xn_tx_chain[NET_TX_RING_SIZE+1]; + struct mbuf *xn_tx_chain[NET_TX_RING_SIZE+1]; struct mbuf *xn_rx_chain[NET_RX_RING_SIZE+1]; }; @@ -1203,7 +1203,7 @@ mmu = np->rx_mmu + pages_flipped; MULTI_update_va_mapping(mcl, (u_long)vaddr, - (mfn << PAGE_SHIFT) | PG_RW | + (((vm_paddr_t)mfn) << PAGE_SHIFT) | PG_RW | PG_V | PG_M | PG_A, 0); pfn = (uint32_t)m->m_ext.ext_arg1; mmu->ptr = ((vm_paddr_t)mfn << PAGE_SHIFT) | ==== //depot/projects/mpsafetty/sys/i386/conf/XEN#2 (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/i386/conf/XEN,v 1.2 2008/08/15 21:47:11 kmacy Exp $ +# $FreeBSD: src/sys/i386/conf/XEN,v 1.3 2008/08/20 10:07:10 kmacy Exp $ cpu I686_CPU ident GENERIC @@ -81,6 +81,7 @@ option XEN nodevice atpic nodevice isa +options MCLSHIFT=12 # To make an SMP kernel, the next two lines are needed options SMP # Symmetric MultiProcessor Kernel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808201040.m7KAeBwe051062>