diff options
author | Dave Young <hidave.darkstar@gmail.com> | 2010-03-10 18:24:07 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:53:10 -0500 |
commit | 15485a4682d1d3bfee2aa78b4b1a5d36f5746b64 (patch) | |
tree | 538857520760de1cf3575c8b5e4f73bab70557ff | |
parent | 5ed109103d73b0bafc92e860cead56725231384d (diff) |
sysctl extern cleanup: sg
Extern declarations in sysctl.c should be moved to their own header file,
and then include them in relavant .c files.
Move sg_big_buff extern declaration to scsi/sg.h
Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
Acked-by: Doug Gilbert <dgilbert@interlog.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/scsi/sg.h | 3 | ||||
-rw-r--r-- | kernel/sysctl.c | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/scsi/sg.h b/include/scsi/sg.h index 934ae389671d..a9f3c6fc3f57 100644 --- a/include/scsi/sg.h +++ b/include/scsi/sg.h | |||
@@ -70,6 +70,9 @@ Major new features in SG 3.x driver (cf SG 2.x drivers) | |||
70 | (for the lk 2.2 series). | 70 | (for the lk 2.2 series). |
71 | */ | 71 | */ |
72 | 72 | ||
73 | #ifdef __KERNEL__ | ||
74 | extern int sg_big_buff; /* for sysctl */ | ||
75 | #endif | ||
73 | 76 | ||
74 | /* New interface introduced in the 3.x SG drivers follows */ | 77 | /* New interface introduced in the 3.x SG drivers follows */ |
75 | 78 | ||
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 44e9492368fd..5290c437f151 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -61,6 +61,9 @@ | |||
61 | #include <asm/stacktrace.h> | 61 | #include <asm/stacktrace.h> |
62 | #include <asm/io.h> | 62 | #include <asm/io.h> |
63 | #endif | 63 | #endif |
64 | #ifdef CONFIG_CHR_DEV_SG | ||
65 | #include <scsi/sg.h> | ||
66 | #endif | ||
64 | 67 | ||
65 | 68 | ||
66 | #if defined(CONFIG_SYSCTL) | 69 | #if defined(CONFIG_SYSCTL) |
@@ -116,10 +119,6 @@ static int min_percpu_pagelist_fract = 8; | |||
116 | 119 | ||
117 | static int ngroups_max = NGROUPS_MAX; | 120 | static int ngroups_max = NGROUPS_MAX; |
118 | 121 | ||
119 | #ifdef CONFIG_CHR_DEV_SG | ||
120 | extern int sg_big_buff; | ||
121 | #endif | ||
122 | |||
123 | #ifdef CONFIG_SPARC | 122 | #ifdef CONFIG_SPARC |
124 | #include <asm/system.h> | 123 | #include <asm/system.h> |
125 | #endif | 124 | #endif |