Merge branch 'master' into next
James Morris [Fri, 8 May 2009 07:56:47 +0000 (17:56 +1000)]
1  2 
Documentation/sysctl/kernel.txt
include/linux/sched.h
kernel/exit.c
kernel/module.c
kernel/signal.c
kernel/sysctl.c
security/commoncap.c
security/selinux/hooks.c
security/smack/smack_lsm.c

Simple merge
Simple merge
diff --cc kernel/exit.c
Simple merge
diff --cc kernel/module.c
  
  /* 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);
  
diff --cc kernel/signal.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge
Simple merge
Simple merge
Simple merge