Subject: pm-disable-usermode-helper-before-hibernation-and-suspend-fix
From: Andrew Morton <akpm@linux-foundation.org>

Please always test allnoconfig and allmodconfig builds

Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 kernel/kmod.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Index: linux-2.6.22/kernel/kmod.c
===================================================================
--- linux-2.6.22.orig/kernel/kmod.c
+++ linux-2.6.22/kernel/kmod.c
@@ -41,13 +41,6 @@ extern int max_threads;
 
 static struct workqueue_struct *khelper_wq;
 
-#ifdef CONFIG_KMOD
-
-/*
-	modprobe_path is set via /proc/sys.
-*/
-char modprobe_path[KMOD_PATH_LEN] = "/sbin/modprobe";
-
 /*
  * If set, both call_usermodehelper_keys() and call_usermodehelper_pipe() exit
  * immediately returning -EBUSY.  Used for preventing user land processes from
@@ -56,6 +49,13 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb
  */
 static int usermodehelper_disabled;
 
+#ifdef CONFIG_KMOD
+
+/*
+	modprobe_path is set via /proc/sys.
+*/
+char modprobe_path[KMOD_PATH_LEN] = "/sbin/modprobe";
+
 /**
  * request_module - try to load a kernel module
  * @fmt:     printf style format string for the name of the module