Date: Tue, 28 Nov 2006 14:30:58 -0800
From: Greg KH <greg@kroah.com>
To: Mariusz Kozlowski <m.kozlowski@tuxland.pl>,
       Kay Sievers <kay.sievers@vrfy.org>
Cc: Andrew Morton <akpm@osdl.org>, linux-kernel@vger.kernel.org
Subject: Re: 2.6.19-rc6-mm2
Message-ID: <20061128223058.GC16152@kroah.com>
References: <20061128020246.47e481eb.akpm@osdl.org> <200611281235.45087.m.kozlowski@tuxland.pl>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200611281235.45087.m.kozlowski@tuxland.pl>
User-Agent: Mutt/1.5.13 (2006-08-11)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1471
Lines: 40

On Tue, Nov 28, 2006 at 12:35:43PM +0100, Mariusz Kozlowski wrote:
> Hello,
> 
> 	When CONFIG_MODULE_UNLOAD is not set then this happens:
> 
>   CC      kernel/module.o
> kernel/module.c:852: error: `initstate' undeclared here (not in a function)
> kernel/module.c:852: error: initializer element is not constant
> kernel/module.c:852: error: (near initialization for `modinfo_attrs[2]')
> make[1]: *** [kernel/module.o] Error 1
> make: *** [kernel] Error 2
> 
> Reference to 'initstate' should stay under #ifdef CONFIG_MODULE_UNLOAD
> as its definition I guess.
> 
> Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
> 
> --- linux-2.6.19-rc6-mm2-a/kernel/module.c      2006-11-28 12:17:09.000000000 +0100
> +++ linux-2.6.19-rc6-mm2-b/kernel/module.c      2006-11-28 12:05:01.000000000 +0100
> @@ -849,8 +849,8 @@ static inline void module_unload_init(st
>  static struct module_attribute *modinfo_attrs[] = {
>         &modinfo_version,
>         &modinfo_srcversion,
> -       &initstate,
>  #ifdef CONFIG_MODULE_UNLOAD
> +       &initstate,
>         &refcnt,
>  #endif

Kay, is this correct?  I think we still need this information exported
to userspace, even if we can't unload modules, right?

thanks,

greg k-h
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/