diff options
| author | kmacy <kmacy@FreeBSD.org> | 2008-08-20 09:47:49 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2008-08-20 09:47:49 +0000 |
| commit | e647d118595054a0a5d15caa48148e53a693af2f (patch) | |
| tree | 573740dfc9bbfabcc5338e1b75fcfb9f1ec72364 /sys/dev/xen | |
| parent | f827c5e9cbc554ac0b0d1f59c1457c7b5229364f (diff) | |
| download | FreeBSD-src-e647d118595054a0a5d15caa48148e53a693af2f.zip FreeBSD-src-e647d118595054a0a5d15caa48148e53a693af2f.tar.gz | |
change netfront to match xen31_6
fix console locking
Diffstat (limited to 'sys/dev/xen')
| -rw-r--r-- | sys/dev/xen/console/console.c | 2 | ||||
| -rw-r--r-- | sys/dev/xen/netfront/netfront.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/xen/console/console.c b/sys/dev/xen/console/console.c index 3620bae..ac6dc70 100644 --- a/sys/dev/xen/console/console.c +++ b/sys/dev/xen/console/console.c @@ -376,12 +376,12 @@ xc_timeout(void *v) 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); } diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c index 472145a..8fb92d3 100644 --- a/sys/dev/xen/netfront/netfront.c +++ b/sys/dev/xen/netfront/netfront.c @@ -148,7 +148,7 @@ static int xennet_get_responses(struct netfront_info *np, * 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 @@ xennet_get_responses(struct netfront_info *np, 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) | |
