From owner-p4-projects@FreeBSD.ORG Tue Oct 2 20:34:10 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4EDA16A418; Tue, 2 Oct 2007 20:34:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7422D16A419 for ; Tue, 2 Oct 2007 20:34:09 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5860013C458 for ; Tue, 2 Oct 2007 20:34:09 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l92KY99f006282 for ; Tue, 2 Oct 2007 20:34:09 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l92KY9sq006279 for perforce@freebsd.org; Tue, 2 Oct 2007 20:34:09 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 2 Oct 2007 20:34:09 GMT Message-Id: <200710022034.l92KY9sq006279@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Oct 2007 20:34:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=127109 Change 127109 by kmacy@kmacy_home:ethng on 2007/10/02 20:33:49 fix i386 build errors Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#10 edit .. //depot/projects/ethng/src/sys/i386/i386/intr_machdep.c#3 edit .. //depot/projects/ethng/src/sys/i386/i386/local_apic.c#3 edit .. //depot/projects/ethng/src/sys/i386/include/intr_machdep.h#3 edit .. //depot/projects/ethng/src/sys/i386/pci/pci_cfgreg.c#2 edit .. //depot/projects/ethng/src/sys/sys/mbuf.h#8 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#10 (text+ko) ==== @@ -40,8 +40,13 @@ #include #include +#include +#include + #include + + #ifdef CONFIG_DEFINED #include #include ==== //depot/projects/ethng/src/sys/i386/i386/intr_machdep.c#3 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -560,7 +561,7 @@ } while (!(intr_cpus & (1 << current_cpu))); } -+/* Attempt to bind the specified IRQ to the specified CPU. */ +/* Attempt to bind the specified IRQ to the specified CPU. */ int intr_bind(u_int vector, u_char cpu) { ==== //depot/projects/ethng/src/sys/i386/i386/local_apic.c#3 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include #include +#include #include #include ==== //depot/projects/ethng/src/sys/i386/include/intr_machdep.h#3 (text+ko) ==== @@ -130,7 +130,7 @@ void elcr_write_trigger(u_int irq, enum intr_trigger trigger); #ifdef SMP void intr_add_cpu(u_int cpu); -int intr_bind(int vector, u_int cpu); +int intr_bind(u_int vector, u_char cpu); #endif int intr_add_handler(const char *name, int vector, driver_filter_t filter, driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep); ==== //depot/projects/ethng/src/sys/i386/pci/pci_cfgreg.c#2 (text+ko) ==== @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/ethng/src/sys/sys/mbuf.h#8 (text+ko) ==== @@ -402,7 +402,7 @@ static __inline struct mbuf *m_getclr(int how, short type); /* XXX */ static __inline struct mbuf *m_free(struct mbuf *m); static __inline void m_clget(struct mbuf *m, int how); -static __inline void *m_cljget(struct mbuf *m, int how, uma_zone_t zone); +static __inline void *m_cljget(struct mbuf *m, int how, int size); static __inline void m_chtype(struct mbuf *m, short new_type); void mb_free_ext(struct mbuf *); static __inline struct mbuf *m_last(struct mbuf *m); @@ -574,15 +574,18 @@ * the cluster attached to it and the return value can be safely ignored. * For size it takes MCLBYTES, MJUMPAGESIZE, MJUM9BYTES, MJUM16BYTES. */ + static __inline void * -m_cljget(struct mbuf *m, int how, uma_zone_t zone) +m_cljget(struct mbuf *m, int how, int size) { + uma_zone_t zone; if (m && m->m_flags & M_EXT) printf("%s: %p mbuf already has cluster\n", __func__, m); if (m != NULL) m->m_ext.ext_buf = NULL; + zone = m_getzone(size); return (uma_zalloc_arg(zone, m, how)); }