OpenVZ Forum


Home » Mailing lists » Devel » [PATCH net-2.6.25 1/6][CORE] Remove unneeded ifdefs from sysctl_net_core.c
[PATCH net-2.6.25 1/6][CORE] Remove unneeded ifdefs from sysctl_net_core.c [message #24118] Sat, 01 December 2007 12:57 Go to next message
Pavel Emelianov is currently offline  Pavel Emelianov
Messages: 1149
Registered: September 2006
Senior Member
They include the whole file, but it is already compiled
out when SYSCTL=n, since it is obj-$(CONFIG_SYSCTL) target
in the Makefile.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

---

diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 113cc72..277c8fa 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -13,8 +13,6 @@
 #include <net/sock.h>
 #include <net/xfrm.h>
 
-#ifdef CONFIG_SYSCTL
-
 ctl_table core_table[] = {
 #ifdef CONFIG_NET
 	{
@@ -151,5 +149,3 @@ ctl_table core_table[] = {
 	},
 	{ .ctl_name = 0 }
 };
-
-#endif
-- 
1.5.3.4
Re: [PATCH net-2.6.25 1/6][CORE] Remove unneeded ifdefs from sysctl_net_core.c [message #24161 is a reply to message #24118] Sun, 02 December 2007 02:05 Go to previous messageGo to next message
ebiederm is currently offline  ebiederm
Messages: 1354
Registered: February 2006
Senior Member
Pavel Emelyanov <xemul@openvz.org> writes:

> They include the whole file, but it is already compiled
> out when SYSCTL=n, since it is obj-$(CONFIG_SYSCTL) target
> in the Makefile.

Pavel thanks for sending these patches.  Might I ask
for some level of acknowledgement when you rework one of
my patches and send it off.

I suppose this could be a case of duplicate thinking but
this patch looks very familiar.

Eric


> Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
>
> ---
>
> diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
> index 113cc72..277c8fa 100644
> --- a/net/core/sysctl_net_core.c
> +++ b/net/core/sysctl_net_core.c
> @@ -13,8 +13,6 @@
>  #include <net/sock.h>
>  #include <net/xfrm.h>
>  
> -#ifdef CONFIG_SYSCTL
> -
>  ctl_table core_table[] = {
>  #ifdef CONFIG_NET
>  	{
> @@ -151,5 +149,3 @@ ctl_table core_table[] = {
>  	},
>  	{ .ctl_name = 0 }
>  };
> -
> -#endif
> -- 
> 1.5.3.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Re: [PATCH net-2.6.25 1/6][CORE] Remove unneeded ifdefs from sysctl_net_core.c [message #24206 is a reply to message #24161] Mon, 03 December 2007 08:57 Go to previous messageGo to next message
Pavel Emelianov is currently offline  Pavel Emelianov
Messages: 1149
Registered: September 2006
Senior Member
Eric W. Biederman wrote:
> Pavel Emelyanov <xemul@openvz.org> writes:
> 
>> They include the whole file, but it is already compiled
>> out when SYSCTL=n, since it is obj-$(CONFIG_SYSCTL) target
>> in the Makefile.
> 
> Pavel thanks for sending these patches.  Might I ask
> for some level of acknowledgement when you rework one of
> my patches and send it off.

Sure. I though I've been doing exactly this thing. I've said
that unix ctls were from your tree and so on.

> I suppose this could be a case of duplicate thinking but
> this patch looks very familiar.

Hm... Do you mean that this one is from your tree? Sorry then,
I didn't know this. I can resend it with From: <you> if you wish.

> Eric

Thanks,
Pavel

>> Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
>>
>> ---
>>
>> diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
>> index 113cc72..277c8fa 100644
>> --- a/net/core/sysctl_net_core.c
>> +++ b/net/core/sysctl_net_core.c
>> @@ -13,8 +13,6 @@
>>  #include <net/sock.h>
>>  #include <net/xfrm.h>
>>  
>> -#ifdef CONFIG_SYSCTL
>> -
>>  ctl_table core_table[] = {
>>  #ifdef CONFIG_NET
>>  	{
>> @@ -151,5 +149,3 @@ ctl_table core_table[] = {
>>  	},
>>  	{ .ctl_name = 0 }
>>  };
>> -
>> -#endif
>> -- 
>> 1.5.3.4
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe netdev" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
Re: [PATCH net-2.6.25 1/6][CORE] Remove unneeded ifdefs from sysctl_net_core.c [message #24225 is a reply to message #24206] Mon, 03 December 2007 11:06 Go to previous message
ebiederm is currently offline  ebiederm
Messages: 1354
Registered: February 2006
Senior Member
Pavel Emelyanov <xemul@openvz.org> writes:

> Eric W. Biederman wrote:
>> Pavel Emelyanov <xemul@openvz.org> writes:
>> 
>>> They include the whole file, but it is already compiled
>>> out when SYSCTL=n, since it is obj-$(CONFIG_SYSCTL) target
>>> in the Makefile.
>> 
>> Pavel thanks for sending these patches.  Might I ask
>> for some level of acknowledgement when you rework one of
>> my patches and send it off.
>
> Sure. I though I've been doing exactly this thing. I've said
> that unix ctls were from your tree and so on.

Ok.  I guess I must have overlooked that attribution.

>> I suppose this could be a case of duplicate thinking but
>> this patch looks very familiar.
>
> Hm... Do you mean that this one is from your tree? Sorry then,
> I didn't know this. I can resend it with From: <you> if you wish.

It is.  But I don't see any of this as needing a resend.  Please
just don't forget me in the future is all I ask.

Eric
Previous Topic: [PATCH] Avoid potential NULL dereference in unregister_sysctl_table
Next Topic: [PATCH net-2.6.25 1/2][IPV6] Make the ipv6/sysctl_net_ipv6.c compilation cleaner
Goto Forum:
  


Current Time: Sat May 25 01:16:35 GMT 2024

Total time taken to generate the page: 0.01685 seconds