From owner-svn-src-all@FreeBSD.ORG  Sat Oct 24 18:15:50 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0FC7A106568B;
	Sat, 24 Oct 2009 18:15:50 +0000 (UTC)
	(envelope-from Andre.Albsmeier@siemens.com)
Received: from goliath.siemens.de (goliath.siemens.de [192.35.17.28])
	by mx1.freebsd.org (Postfix) with ESMTP id 95B278FC15;
	Sat, 24 Oct 2009 18:15:49 +0000 (UTC)
Received: from mail3.siemens.de (localhost [127.0.0.1])
	by goliath.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id
	n9OHlOou007524; Sat, 24 Oct 2009 19:47:24 +0200
Received: from curry.mchp.siemens.de (curry.mchp.siemens.de [139.25.40.130])
	by mail3.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id
	n9OHlOQS017594; Sat, 24 Oct 2009 19:47:24 +0200
Received: (from localhost)
	by curry.mchp.siemens.de (8.14.3/8.14.3) id n9OHlOnD051564;
Date: Sat, 24 Oct 2009 19:47:24 +0200
From: Andre Albsmeier <Andre.Albsmeier@siemens.com>
To: Andrew Gallatin <gallatin@freebsd.org>
Message-ID: <20091024174724.GA57864@curry.mchp.siemens.de>
References: <200910191911.n9JJB0tQ010150@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200910191911.n9JJB0tQ010150@svn.freebsd.org>
X-Echelon: <censored>
X-Advice: Drop that crappy M$-Outlook, I'm tired of your viruses!
User-Agent: Mutt/1.5.20 (2009-06-14)
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, svn-src-stable-7@freebsd.org
Subject: Re: svn commit: r198244 - in stable/7/sys: . contrib/pf kern sys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Oct 2009 18:15:50 -0000

On Mon, 19-Oct-2009 at 19:11:00 +0000, Andrew Gallatin wrote:
> Author: gallatin
> Date: Mon Oct 19 19:11:00 2009
> New Revision: 198244
> URL: http://svn.freebsd.org/changeset/base/198244
> 
> Log:
>   MFC of 178042 to allow safe firmware(9) loading from NIC watchdog handlers.
>        Also MFCed are the related changes 178016, 183614 and 184842.
>   
> ...
> 
> Modified: stable/7/sys/kern/subr_firmware.c
> ==============================================================================
> --- stable/7/sys/kern/subr_firmware.c	Mon Oct 19 18:52:05 2009	(r198243)
> +++ stable/7/sys/kern/subr_firmware.c	Mon Oct 19 19:11:00 2009	(r198244)
> @@ -1,5 +1,5 @@
>  /*-
> - * Copyright (c) 2005, Sam Leffler <sam@errno.com>
> + * Copyright (c) 2005-2008, Sam Leffler <sam@errno.com>
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
> @@ -41,6 +41,10 @@ __FBSDID("$FreeBSD$");
>  #include <sys/priv.h>
>  #include <sys/proc.h>
>  #include <sys/module.h>
> +#include <sys/eventhandler.h>
> +
> +#include <sys/filedesc.h>
> +#include <sys/vnode.h>

This broke "make world" on 7-STABLE when MODULES_WITH_WORLD
is defined. The fix is:

--- sys/modules/firmware/Makefile.ORI	2007-10-24 19:13:38.000000000 +0200
+++ sys/modules/firmware/Makefile	2009-10-24 19:38:10.000000000 +0200
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../kern
 
 KMOD=	firmware
-SRCS=	subr_firmware.c
+SRCS=	subr_firmware.c vnode_if.h
 
 .include <bsd.kmod.mk>


	-Andre