[PATCH] Kernel doesn't compile with CONFIG_HOTPLUG && !CONFIG_NET

[PATCH] Kernel doesn't compile with CONFIG_HOTPLUG && !CONFIG_NET

[Nigel Cunningham]

[-- Attachment #1: Type: text/plain, Size: 719 bytes --]

Hi.

2.6.17-rc1 doesn't compile if networking support is disabled but hotplug is
enabled. This patch addresses that issue.

Please consider applying.

Signed-off-by: Nigel Cunningham <nigel@suspend2.net>

 sysctl.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff -ruNp 9904.patch-old/kernel/sysctl.c 9904.patch-new/kernel/sysctl.c
--- 9904.patch-old/kernel/sysctl.c	2006-04-19 08:40:47.000000000 +1000
+++ 9904.patch-new/kernel/sysctl.c	2006-04-17 21:06:23.000000000 +1000
@@ -401,7 +401,7 @@ static ctl_table kern_table[] = {
 		.strategy	= &sysctl_string,
 	},
 #endif
-#ifdef CONFIG_HOTPLUG
+#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
 	{
 		.ctl_name	= KERN_HOTPLUG,
 		.procname	= "hotplug",

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] Kernel doesn't compile with CONFIG_HOTPLUG && !CONFIG_NET

[Andrew Morton]

Nigel Cunningham <ncunningham@cyclades.com> wrote:
>
> --- 9904.patch-old/kernel/sysctl.c	2006-04-19 08:40:47.000000000 +1000
> +++ 9904.patch-new/kernel/sysctl.c	2006-04-17 21:06:23.000000000 +1000
> @@ -401,7 +401,7 @@ static ctl_table kern_table[] = {
>  		.strategy	= &sysctl_string,
>  	},
>  #endif
> -#ifdef CONFIG_HOTPLUG
> +#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)

I've had this in -mm for a couple of weeks now but rmk points out that it's
rather silly.  Because if you have CONFIG_HOTPLUG=y, CONFIG_NET=n then the
kernel cannot deliver hotplug events to userspace..

So perhaps CONFIG_HOTPLUG should depend upon CONFIG_NET or, better,
CONFIG_NETLINK.

Dunno.  I left this in Greg's lap, but he's hiding.

Re: [PATCH] Kernel doesn't compile with CONFIG_HOTPLUG && !CONFIG_NET

[Nigel Cunningham]

[-- Attachment #1: Type: text/plain, Size: 895 bytes --]

Hi.

On Wednesday 19 April 2006 09:16, Andrew Morton wrote:
> Nigel Cunningham <ncunningham@cyclades.com> wrote:
> > --- 9904.patch-old/kernel/sysctl.c	2006-04-19 08:40:47.000000000 +1000
> > +++ 9904.patch-new/kernel/sysctl.c	2006-04-17 21:06:23.000000000 +1000
> > @@ -401,7 +401,7 @@ static ctl_table kern_table[] = {
> >  		.strategy	= &sysctl_string,
> >  	},
> >  #endif
> > -#ifdef CONFIG_HOTPLUG
> > +#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
>
> I've had this in -mm for a couple of weeks now but rmk points out that it's
> rather silly.  Because if you have CONFIG_HOTPLUG=y, CONFIG_NET=n then the
> kernel cannot deliver hotplug events to userspace..
>
> So perhaps CONFIG_HOTPLUG should depend upon CONFIG_NET or, better,
> CONFIG_NETLINK.
>
> Dunno.  I left this in Greg's lap, but he's hiding.

:) Ah okay. I guess he's been busy with those mini summits.

Regards,

Nigel

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] Kernel doesn't compile with CONFIG_HOTPLUG && !CONFIG_NET

[Greg KH]

On Tue, Apr 18, 2006 at 04:16:14PM -0700, Andrew Morton wrote:
> Nigel Cunningham <ncunningham@cyclades.com> wrote:
> >
> > --- 9904.patch-old/kernel/sysctl.c	2006-04-19 08:40:47.000000000 +1000
> > +++ 9904.patch-new/kernel/sysctl.c	2006-04-17 21:06:23.000000000 +1000
> > @@ -401,7 +401,7 @@ static ctl_table kern_table[] = {
> >  		.strategy	= &sysctl_string,
> >  	},
> >  #endif
> > -#ifdef CONFIG_HOTPLUG
> > +#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
> 
> I've had this in -mm for a couple of weeks now but rmk points out that it's
> rather silly.  Because if you have CONFIG_HOTPLUG=y, CONFIG_NET=n then the
> kernel cannot deliver hotplug events to userspace..
> 
> So perhaps CONFIG_HOTPLUG should depend upon CONFIG_NET or, better,
> CONFIG_NETLINK.

I have a patch in the queue from Kay that should fix this.  Hopefully...
Will get to it tomorrow.

> Dunno.  I left this in Greg's lap, but he's hiding.

Hiding?  A -stable release a day sure isn't hiding :)

thanks,

greg k-h