2008-11-16 10:22:40

by Ming Lei

Subject: [PATCH] kernel/ksysfs.c:fix dependence on CONFIG_NET

From: Ming Lei <[email protected]>

Access to uevent_seqnum and uevent_helper does not need to
depend on CONFIG_NET, so remove it.

Signed-off-by: Ming Lei <[email protected]>
---
kernel/ksysfs.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
index 08dd8ed..528dd78 100644
--- a/kernel/ksysfs.c
+++ b/kernel/ksysfs.c
@@ -24,7 +24,7 @@ static struct kobj_attribute _name##_attr = __ATTR_RO(_name)
static struct kobj_attribute _name##_attr = \
__ATTR(_name, 0644, _name##_show, _name##_store)

-#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
+#if defined(CONFIG_HOTPLUG)
/* current uevent sequence number */
static ssize_t uevent_seqnum_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buf)
@@ -137,7 +137,7 @@ struct kobject *kernel_kobj;
EXPORT_SYMBOL_GPL(kernel_kobj);

static struct attribute * kernel_attrs[] = {
-#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
+#if defined(CONFIG_HOTPLUG)
&uevent_seqnum_attr.attr,
&uevent_helper_attr.attr,
#endif
--
1.6.0

2008-11-18 23:38:30

by Andrew Morton

Subject: Re: [PATCH] kernel/ksysfs.c:fix dependence on CONFIG_NET

On Sun, 16 Nov 2008 18:22:09 +0800
[email protected] wrote:

> From: Ming Lei <[email protected]>
>
> Access to uevent_seqnum and uevent_helper does not need to
> depend on CONFIG_NET, so remove it.
>
> Signed-off-by: Ming Lei <[email protected]>
> ---
> kernel/ksysfs.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
> index 08dd8ed..528dd78 100644
> --- a/kernel/ksysfs.c
> +++ b/kernel/ksysfs.c
> @@ -24,7 +24,7 @@ static struct kobj_attribute _name##_attr = __ATTR_RO(_name)
> static struct kobj_attribute _name##_attr = \
> __ATTR(_name, 0644, _name##_show, _name##_store)
>
> -#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
> +#if defined(CONFIG_HOTPLUG)
> /* current uevent sequence number */
> static ssize_t uevent_seqnum_show(struct kobject *kobj,
> struct kobj_attribute *attr, char *buf)
> @@ -137,7 +137,7 @@ struct kobject *kernel_kobj;
> EXPORT_SYMBOL_GPL(kernel_kobj);
>
> static struct attribute * kernel_attrs[] = {
> -#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
> +#if defined(CONFIG_HOTPLUG)
> &uevent_seqnum_attr.attr,
> &uevent_helper_attr.attr,
> #endif

I think the story here is that uevent uses netlink, and with
CONFIG_NET=n, we have no netlink, so that code couldn't do anything
anyway.

2008-11-18 23:41:40

by Andrew Morton

Subject: Re: [PATCH] kernel/ksysfs.c:fix dependence on CONFIG_NET

On Tue, 18 Nov 2008 15:38:18 -0800
Andrew Morton <[email protected]> wrote:

> On Sun, 16 Nov 2008 18:22:09 +0800
> [email protected] wrote:
>
> > From: Ming Lei <[email protected]>
> >
> > Access to uevent_seqnum and uevent_helper does not need to
> > depend on CONFIG_NET, so remove it.
> >
> > Signed-off-by: Ming Lei <[email protected]>
> > ---
> > kernel/ksysfs.c | 4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
> > index 08dd8ed..528dd78 100644
> > --- a/kernel/ksysfs.c
> > +++ b/kernel/ksysfs.c
> > @@ -24,7 +24,7 @@ static struct kobj_attribute _name##_attr = __ATTR_RO(_name)
> > static struct kobj_attribute _name##_attr = \
> > __ATTR(_name, 0644, _name##_show, _name##_store)
> >
> > -#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
> > +#if defined(CONFIG_HOTPLUG)
> > /* current uevent sequence number */
> > static ssize_t uevent_seqnum_show(struct kobject *kobj,
> > struct kobj_attribute *attr, char *buf)
> > @@ -137,7 +137,7 @@ struct kobject *kernel_kobj;
> > EXPORT_SYMBOL_GPL(kernel_kobj);
> >
> > static struct attribute * kernel_attrs[] = {
> > -#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
> > +#if defined(CONFIG_HOTPLUG)
> > &uevent_seqnum_attr.attr,
> > &uevent_helper_attr.attr,
> > #endif
>
> I think the story here is that uevent uses netlink, and with
> CONFIG_NET=n, we have no netlink, so that code couldn't do anything
> anyway.
>

Or not. Perhaps we can still use uevent_helper in this case?

(Getting a bit tired of writing people's changelogs for them!)

2008-11-19 01:26:13

by Ming Lei

Subject: Re: [PATCH] kernel/ksysfs.c:fix dependence on CONFIG_NET

2008/11/19 Andrew Morton <[email protected]>:
> On Tue, 18 Nov 2008 15:38:18 -0800
> Andrew Morton <[email protected]> wrote:
>
>> On Sun, 16 Nov 2008 18:22:09 +0800
>> [email protected] wrote:
>>
>> > From: Ming Lei <[email protected]>
>> >
>> > Access to uevent_seqnum and uevent_helper does not need to
>> > depend on CONFIG_NET, so remove it.
>> >
>> > Signed-off-by: Ming Lei <[email protected]>
>> > ---
>> > kernel/ksysfs.c | 4 ++--
>> > 1 files changed, 2 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
>> > index 08dd8ed..528dd78 100644
>> > --- a/kernel/ksysfs.c
>> > +++ b/kernel/ksysfs.c
>> > @@ -24,7 +24,7 @@ static struct kobj_attribute _name##_attr = __ATTR_RO(_name)
>> > static struct kobj_attribute _name##_attr = \
>> > __ATTR(_name, 0644, _name##_show, _name##_store)
>> >
>> > -#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
>> > +#if defined(CONFIG_HOTPLUG)
>> > /* current uevent sequence number */
>> > static ssize_t uevent_seqnum_show(struct kobject *kobj,
>> > struct kobj_attribute *attr, char *buf)
>> > @@ -137,7 +137,7 @@ struct kobject *kernel_kobj;
>> > EXPORT_SYMBOL_GPL(kernel_kobj);
>> >
>> > static struct attribute * kernel_attrs[] = {
>> > -#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
>> > +#if defined(CONFIG_HOTPLUG)
>> > &uevent_seqnum_attr.attr,
>> > &uevent_helper_attr.attr,
>> > #endif
>>
>> I think the story here is that uevent uses netlink, and with
>> CONFIG_NET=n, we have no netlink, so that code couldn't do anything
>> anyway.
>>
>
> Or not. Perhaps we can still use uevent_helper in this case?

yes.


>
> (Getting a bit tired of writing people's changelogs for them!)
>



--
Lei Ming