2010-02-20 14:13:38

by Dave Young

[permalink] [raw]
Subject: [PATCH 07/18] sysctl extern cleanup - compat

Extern declarations in sysctl.c should be move to their own head file,
and then include them in relavant .c files.

Move compat_log extern declaration to linux/compat.h

Signed-off-by: Dave Young <[email protected]>
---
include/linux/compat.h | 3 +++
kernel/sysctl.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)

--- linux-2.6.32.orig/include/linux/compat.h 2010-02-20 14:02:24.334925488 +0800
+++ linux-2.6.32/include/linux/compat.h 2010-02-20 14:24:30.405627048 +0800
@@ -17,6 +17,9 @@
#include <asm/siginfo.h>
#include <asm/signal.h>

+#ifdef CONFIG_SYSCTL
+extern int compat_log;
+#endif
#define compat_jiffies_to_clock_t(x) \
(((unsigned long)(x) * COMPAT_USER_HZ) / HZ)

--- linux-2.6.32.orig/kernel/sysctl.c 2010-02-20 14:13:28.511525875 +0800
+++ linux-2.6.32/kernel/sysctl.c 2010-02-20 14:23:58.042295739 +0800
@@ -58,6 +58,7 @@
#include <linux/threads.h>
#include <linux/binfmts.h>
#include <linux/pid.h>
+#include <linux/compat.h>

#include <asm/uaccess.h>
#include <asm/processor.h>
@@ -72,7 +73,6 @@
#if defined(CONFIG_SYSCTL)

/* External variables not in a header file. */
-extern int compat_log;
extern int latencytop_enabled;
extern int sysctl_nr_open_min, sysctl_nr_open_max;
#ifdef CONFIG_RCU_TORTURE_TEST


2010-02-20 14:52:17

by Arnd Bergmann

[permalink] [raw]
Subject: Re: [PATCH 07/18] sysctl extern cleanup - compat

On Saturday 20 February 2010 15:13:28 Dave Young wrote:
> Extern declarations in sysctl.c should be move to their own head file,
> and then include them in relavant .c files.
>
> Move compat_log extern declaration to linux/compat.h
>
> Signed-off-by: Dave Young <[email protected]>

Good idea in principle, but please don't enclose the extern
declaration in #ifdef:

> --- linux-2.6.32.orig/include/linux/compat.h 2010-02-20 14:02:24.334925488 +0800
> +++ linux-2.6.32/include/linux/compat.h 2010-02-20 14:24:30.405627048 +0800
> @@ -17,6 +17,9 @@
> #include <asm/siginfo.h>
> #include <asm/signal.h>
>
> +#ifdef CONFIG_SYSCTL
> +extern int compat_log;
> +#endif
> #define compat_jiffies_to_clock_t(x) \
> (((unsigned long)(x) * COMPAT_USER_HZ) / HZ)

This will force a rebuild of everything that #includes linux/compat.h when CONFIG_SYSCTL
changes, while nothing really changes.

Obviously, the same goes for the entire series.

Arnd

2010-02-20 15:16:33

by Dave Young

[permalink] [raw]
Subject: Re: [PATCH 07/18] sysctl extern cleanup - compat

On Sat, Feb 20, 2010 at 10:51 PM, Arnd Bergmann <[email protected]> wrote:
> On Saturday 20 February 2010 15:13:28 Dave Young wrote:
>> Extern declarations in sysctl.c should be move to their own head file,
>> and then include them in relavant .c files.
>>
>> Move compat_log extern declaration to linux/compat.h
>>
>> Signed-off-by: Dave Young <[email protected]>
>
> Good idea in principle, but please don't enclose the extern
> declaration in #ifdef:
>
>> --- linux-2.6.32.orig/include/linux/compat.h  2010-02-20 14:02:24.334925488 +0800
>> +++ linux-2.6.32/include/linux/compat.h       2010-02-20 14:24:30.405627048 +0800
>> @@ -17,6 +17,9 @@
>>  #include <asm/siginfo.h>
>>  #include <asm/signal.h>
>>
>> +#ifdef CONFIG_SYSCTL
>> +extern int compat_log;
>> +#endif
>>  #define compat_jiffies_to_clock_t(x) \
>>               (((unsigned long)(x) * COMPAT_USER_HZ) / HZ)
>
> This will force a rebuild of everything that #includes linux/compat.h when CONFIG_SYSCTL
> changes, while nothing really changes.
>
> Obviously, the same goes for the entire series.

Yes, indeed. Thanks for the comments.

Actually I need resend the whole patchset with a updated version.

>
>        Arnd
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>



--
Regards
dave