2010-02-21 14:23:52

by Dave Young

[permalink] [raw]
Subject: [PATCH -mm 06/17] 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 | 1 +
kernel/sysctl.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)

--- linux-2.6.32.orig/include/linux/compat.h 2010-02-21 09:35:58.263191188 +0800
+++ linux-2.6.32/include/linux/compat.h 2010-02-21 09:55:28.093075111 +0800
@@ -17,6 +17,7 @@
#include <asm/siginfo.h>
#include <asm/signal.h>

+extern int compat_log; /* for sysctl */
#define compat_jiffies_to_clock_t(x) \
(((unsigned long)(x) * COMPAT_USER_HZ) / HZ)

--- linux-2.6.32.orig/kernel/sysctl.c 2010-02-21 09:52:58.139756932 +0800
+++ linux-2.6.32/kernel/sysctl.c 2010-02-21 09:55:08.013076578 +0800
@@ -57,6 +57,7 @@
#include <linux/signal.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 @@

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