From owner-svn-src-head@FreeBSD.ORG  Wed May  6 08:49:39 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E58BB106566C;
	Wed,  6 May 2009 08:49:39 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D49958FC15;
	Wed,  6 May 2009 08:49:39 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n468nd5B011325;
	Wed, 6 May 2009 08:49:39 GMT (envelope-from zec@svn.freebsd.org)
Received: (from zec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n468ndKs011322;
	Wed, 6 May 2009 08:49:39 GMT (envelope-from zec@svn.freebsd.org)
Message-Id: <200905060849.n468ndKs011322@svn.freebsd.org>
From: Marko Zec <zec@FreeBSD.org>
Date: Wed, 6 May 2009 08:49:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191845 - in head/sys: netinet sys
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 May 2009 08:49:40 -0000

Author: zec
Date: Wed May  6 08:49:39 2009
New Revision: 191845
URL: http://svn.freebsd.org/changeset/base/191845

Log:
  Unbreak options VIMAGE kernel builds.
  
  Approved by:	julian (mentor)

Modified:
  head/sys/netinet/sctp_crc32.c
  head/sys/netinet/sctp_os_bsd.h
  head/sys/sys/vimage.h

Modified: head/sys/netinet/sctp_crc32.c
==============================================================================
--- head/sys/netinet/sctp_crc32.c	Wed May  6 05:08:58 2009	(r191844)
+++ head/sys/netinet/sctp_crc32.c	Wed May  6 08:49:39 2009	(r191845)
@@ -34,16 +34,11 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/uio.h>
-#include <sys/libkern.h>
+#include <netinet/sctp_os.h>
 #include <netinet/sctp.h>
 #include <netinet/sctp_crc32.h>
 #include <netinet/sctp_pcb.h>
 
-
 #if !defined(SCTP_WITH_NO_CSUM)
 
 static uint32_t

Modified: head/sys/netinet/sctp_os_bsd.h
==============================================================================
--- head/sys/netinet/sctp_os_bsd.h	Wed May  6 05:08:58 2009	(r191844)
+++ head/sys/netinet/sctp_os_bsd.h	Wed May  6 08:49:39 2009	(r191845)
@@ -84,6 +84,7 @@ __FBSDID("$FreeBSD$");
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
 #include <netipsec/key.h>
+#include <netipsec/vipsec.h>
 #endif				/* IPSEC */
 
 #ifdef INET6

Modified: head/sys/sys/vimage.h
==============================================================================
--- head/sys/sys/vimage.h	Wed May  6 05:08:58 2009	(r191844)
+++ head/sys/sys/vimage.h	Wed May  6 08:49:39 2009	(r191845)
@@ -33,6 +33,7 @@
 #ifndef	_SYS_VIMAGE_H_
 #define	_SYS_VIMAGE_H_
 
+#include <sys/proc.h>
 #include <sys/queue.h>
 
 #if defined(VIMAGE) && defined(VIMAGE_GLOBALS)