reiserfs: fix oops while creating privroot with selinux enabled

[safe/jmp/linux-2.6] / include / linux / module.h

diff --git a/include/linux/module.h b/include/linux/module.h
index 2302f09..5e869ff 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -17,7 +17,6 @@
 #include <linux/moduleparam.h>
 #include <linux/tracepoint.h>
 
-#include <asm/local.h>
 #include <linux/percpu.h>
 #include <asm/module.h>
 
@@ -176,6 +175,7 @@ struct notifier_block;
 
 #ifdef CONFIG_MODULES
 
+extern int modules_disabled; /* for sysctl */
 /* Get/put a kernel symbol (calls must be symmetric) */
 void *__symbol_get(const char *symbol);
 void *__symbol_get_gpl(const char *symbol);
@@ -366,7 +366,7 @@ struct module
 
        struct module_ref {
                int count;
-       } *refptr;
+       } __percpu *refptr;
 #endif
 
 #ifdef CONFIG_CONSTRUCTORS