From 305a5e4ad81bb9ba9e607a37c96e4ae9714969e0 Mon Sep 17 00:00:00 2001
From: Dave Young <hidave.darkstar@gmail.com>
Date: Wed, 10 Mar 2010 15:24:07 -0800
Subject: [PATCH] --- yaml --- r: 187316 b: refs/heads/master c:
 15485a4682d1d3bfee2aa78b4b1a5d36f5746b64 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/include/scsi/sg.h | 3 +++
 trunk/kernel/sysctl.c   | 7 +++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8738a1acf557..8b88bf1bbe80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ed109103d73b0bafc92e860cead56725231384d
+refs/heads/master: 15485a4682d1d3bfee2aa78b4b1a5d36f5746b64
diff --git a/trunk/include/scsi/sg.h b/trunk/include/scsi/sg.h
index 934ae389671d..a9f3c6fc3f57 100644
--- a/trunk/include/scsi/sg.h
+++ b/trunk/include/scsi/sg.h
@@ -70,6 +70,9 @@ Major new features in SG 3.x driver (cf SG 2.x drivers)
  (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 */
 
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
index 44e9492368fd..5290c437f151 100644
--- a/trunk/kernel/sysctl.c
+++ b/trunk/kernel/sysctl.c
@@ -61,6 +61,9 @@
 #include <asm/stacktrace.h>
 #include <asm/io.h>
 #endif
+#ifdef CONFIG_CHR_DEV_SG
+#include <scsi/sg.h>
+#endif
 
 
 #if defined(CONFIG_SYSCTL)
@@ -116,10 +119,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