2010-02-21 14:25:01

by Dave Young

[permalink] [raw]
Subject: [PATCH -mm 12/17] sysctl extern cleanup - sg

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

Move sg_big_buff extern declaration to scsi/sg.h

Signed-off-by: Dave Young <[email protected]>
---
include/scsi/sg.h | 3 +++
kernel/sysctl.c | 7 +++----
2 files changed, 6 insertions(+), 4 deletions(-)

--- linux-2.6.32.orig/include/scsi/sg.h 2010-02-21 11:15:43.753424739 +0800
+++ linux-2.6.32/include/scsi/sg.h 2010-02-21 11:20:17.046732438 +0800
@@ -70,6 +70,9 @@ Major new features in SG 3.x driver (cf
(for the lk 2.2 series).
*/

+#ifdef __KERNEL__
+extern int sg_big_buff; /* for sysctl */
+#endif

/* New interface introduced in the 3.x SG drivers follows */

--- linux-2.6.32.orig/kernel/sysctl.c 2010-02-21 11:20:12.086732161 +0800
+++ linux-2.6.32/kernel/sysctl.c 2010-02-21 11:21:02.202561933 +0800
@@ -63,6 +63,9 @@
#ifdef CONFIG_BLOCK
#include <linux/blk-iopoll.h>
#endif
+#ifdef CONFIG_CHR_DEV_SG
+#include <scsi/sg.h>
+#endif

#include <asm/uaccess.h>
#include <asm/processor.h>
@@ -104,10 +107,6 @@ static int min_percpu_pagelist_fract = 8

static int ngroups_max = NGROUPS_MAX;

-#ifdef CONFIG_CHR_DEV_SG
-extern int sg_big_buff;
-#endif
-
#ifdef CONFIG_SPARC
#include <asm/system.h>
#endif