From: James Morris <jmorris@namei.org>
Date: Fri, 8 May 2009 07:56:47 +0000 (+1000)
Subject: Merge branch 'master' into next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d254117099d711f215e62427f55dfb8ebd5ad011;p=linux.git

Merge branch 'master' into next
---

d254117099d711f215e62427f55dfb8ebd5ad011
diff --cc kernel/module.c
index ee7ab612dafa0,e797812a4d95f..cb3887e770e21
--- a/kernel/module.c
+++ b/kernel/module.c
@@@ -68,12 -68,10 +68,13 @@@
  
  /* List of modules, protected by module_mutex or preempt_disable
   * (delete uses stop_machine/add uses RCU list operations). */
- static DEFINE_MUTEX(module_mutex);
+ DEFINE_MUTEX(module_mutex);
+ EXPORT_SYMBOL_GPL(module_mutex);
  static LIST_HEAD(modules);
  
 +/* Block module loading/unloading? */
 +int modules_disabled = 0;
 +
  /* Waiting for a module to finish initializing? */
  static DECLARE_WAIT_QUEUE_HEAD(module_wq);