PERFORCE change 127109 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=127109

Change 127109 by kmacy at 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 <sys/ktr.h>
 #include <sys/sf_buf.h>
 
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
 #include <machine/bus.h>
 
+
+
 #ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
 #include <sys/mvec.h>

==== //depot/projects/ethng/src/sys/i386/i386/intr_machdep.c#3 (text+ko) ====

@@ -47,6 +47,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
+#include <sys/smp.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
 #include <sys/sx.h>
@@ -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 <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/pcpu.h>
+#include <sys/proc.h>
 #include <sys/smp.h>
 
 #include <vm/vm.h>

==== //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 <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/malloc.h>
+#include <sys/proc.h>
 #include <sys/queue.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>

==== //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));
 }