svn commit: r198244 - in stable/7/sys: . contrib/pf kern sys

[Andre Albsmeier]

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 at errno.com>
> + * Copyright (c) 2005-2008, Sam Leffler <sam at 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