Date: Tue, 1 Mar 2005 21:08:41 GMT From: John-Mark Gurney <jmg@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 72294 for review Message-ID: <200503012108.j21L8f0h095538@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=72294 Change 72294 by jmg@jmg_carbon on 2005/03/01 21:08:36 pull in the realmem fix.. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/arm/src/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/arm/src/sys/netgraph/ng_eiface.c#2 integrate Differences ... ==== //depot/projects/arm/src/sys/arm/arm/machdep.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.14 2005/02/26 18:59:01 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.15 2005/03/01 20:12:52 cognet Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -93,6 +93,8 @@ int cold = 1; vm_offset_t vector_page; +long realmem = 0; + void sendsig(catcher, sig, mask, code) sig_t catcher; @@ -242,6 +244,7 @@ m = vm_page_alloc(NULL, 0, VM_ALLOC_NOOBJ | VM_ALLOC_ZERO); pmap_kenter_user(ARM_TP_ADDRESS, VM_PAGE_TO_PHYS(m)); #endif + realmem = physmem; } ==== //depot/projects/arm/src/sys/arm/arm/swtch.S#3 (text+ko) ==== @@ -83,7 +83,7 @@ #include <machine/asm.h> #include <machine/asmacros.h> #include <machine/armreg.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.12 2005/02/26 18:59:01 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.13 2005/03/01 20:51:37 cognet Exp $"); /* @@ -202,8 +202,7 @@ str r5, [r6] /* Set the new tp */ - ldr r6, [r5, #(TD_MD)] - add r6, r6, #(MD_TP) + ldr r6, [r5, #(TD_MD + MD_TP)] mov r5, #ARM_TP_ADDRESS str r6, [r5] @@ -300,6 +299,7 @@ ldr r5, [r9, #(PCB_DACR)] /* r5 = new DACR */ mov r2, #DOMAIN_CLIENT cmp r5, r2, lsl #(PMAP_DOMAIN_KERNEL * 2) /* Sw to kernel thread? */ + mcreq p15, 0, r5, c3, c0, 0 /* Update DACR for new context */ beq .Lcs_context_switched /* Yup. Don't flush cache */ mrc p15, 0, r0, c3, c0, 0 /* r0 = old DACR */ /* ==== //depot/projects/arm/src/sys/netgraph/ng_eiface.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.26 2005/02/08 10:31:55 ru Exp $ + * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.27 2005/03/01 19:39:57 ru Exp $ */ #include <sys/param.h> @@ -613,6 +613,12 @@ return (ENETDOWN); } + if (m->m_len < ETHER_HDR_LEN) { + m = m_pullup(m, ETHER_HDR_LEN); + if (m == NULL) + return (EINVAL); + } + /* Note receiving interface */ m->m_pkthdr.rcvif = ifp;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503012108.j21L8f0h095538>