svn commit: r189784 - in user/kmacy/releng_7_net_backport/sys: kern sys vm

[Kip Macy]

Author: kmacy
Date: Sat Mar 14 06:48:50 2009
New Revision: 189784
URL: http://svn.freebsd.org/changeset/base/189784

Log:
  - fix protosw size mismatch
  - disable superpage assert

Modified:
  user/kmacy/releng_7_net_backport/sys/kern/uipc_domain.c
  user/kmacy/releng_7_net_backport/sys/sys/protosw.h
  user/kmacy/releng_7_net_backport/sys/vm/vm_page.c

Modified: user/kmacy/releng_7_net_backport/sys/kern/uipc_domain.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/kern/uipc_domain.c	Sat Mar 14 05:33:09 2009	(r189783)
+++ user/kmacy/releng_7_net_backport/sys/kern/uipc_domain.c	Sat Mar 14 06:48:50 2009	(r189784)
@@ -145,7 +145,8 @@ net_init_domain(struct domain *dp)
 	if (dp->dom_init)
 		(*dp->dom_init)();
 	for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
-		protosw_init(pr);
+	    protosw_init(pr);
+
 	/*
 	 * update global information about maximums
 	 */
@@ -404,7 +405,6 @@ found:
 	dpr->pr_output = NULL;
 	dpr->pr_ctlinput = NULL;
 	dpr->pr_ctloutput = NULL;
-	dpr->pr_ousrreq = NULL;
 	dpr->pr_init = NULL;
 	dpr->pr_fasttimo = NULL;
 	dpr->pr_slowtimo = NULL;

Modified: user/kmacy/releng_7_net_backport/sys/sys/protosw.h
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/sys/protosw.h	Sat Mar 14 05:33:09 2009	(r189783)
+++ user/kmacy/releng_7_net_backport/sys/sys/protosw.h	Sat Mar 14 06:48:50 2009	(r189784)
@@ -89,15 +89,14 @@ struct protosw {
 	pr_output_t *pr_output;		/* output to protocol (from above) */
 	pr_ctlinput_t *pr_ctlinput;	/* control input (from below) */
 	pr_ctloutput_t *pr_ctloutput;	/* control output (from above) */
-/* user-protocol hook */
-	pr_usrreq_t	*pr_ousrreq;
 /* utility hooks */
 	pr_init_t *pr_init;
 	pr_fasttimo_t *pr_fasttimo;	/* fast timeout (200ms) */
 	pr_slowtimo_t *pr_slowtimo;	/* slow timeout (500ms) */
 	pr_drain_t *pr_drain;		/* flush any excess space possible */
 
-	struct	pr_usrreqs *pr_usrreqs;	/* supersedes pr_usrreq() */
+	struct	pr_usrreqs *pr_usrreqs;	/* user-protocol hook */
+
 };
 /*#endif*/
 
@@ -201,7 +200,6 @@ struct uio;
  * See uipc_domain.c:net_init_domain()
  */
 struct pr_usrreqs {
-	double	__Break_the_struct_layout_for_now;
 	void	(*pru_abort)(struct socket *so);
 	int	(*pru_accept)(struct socket *so, struct sockaddr **nam);
 	int	(*pru_attach)(struct socket *so, int proto, struct thread *td);

Modified: user/kmacy/releng_7_net_backport/sys/vm/vm_page.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/vm/vm_page.c	Sat Mar 14 05:33:09 2009	(r189783)
+++ user/kmacy/releng_7_net_backport/sys/vm/vm_page.c	Sat Mar 14 06:48:50 2009	(r189784)
@@ -370,9 +370,10 @@ vm_page_startup(vm_offset_t vaddr)
 	page_range = 0;
 	for (i = 0; phys_avail[i + 1] != 0; i += 2)
 		page_range += atop(phys_avail[i + 1] - phys_avail[i]);
+#if 0
 	KASSERT(page_range == npages,
 	    ("vm_page_startup: inconsistent page counts"));
-
+#endif
 	/*
 	 * Initialize the physical memory allocator.
 	 */