aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDean Nelson <dcn@sgi.com>2008-12-02 08:06:01 -0600
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-02 15:51:35 -0800
commit026bde120a161d9035502a47dd311bd572f6d31f (patch)
tree33c611fe977766b98442db0b99700e8e1921171b
parent7a0d7940e7c7c143520e38900ddd4e217d3c6640 (diff)
sgi-gru: call fs_initcall() if statically linked
If xpc.ko and gru.ko are both statically linked into the kernel, then xpc_init() can get called before gru_init() and make a call to one of the gru's exported functions before the gru has initialized itself. The end result is a NULL dereference. Signed-off-by: Dean Nelson <dcn@sgi.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/misc/sgi-gru/grufile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index 5c027b6b4e5..65098380639 100644
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -481,7 +481,7 @@ struct vm_operations_struct gru_vm_ops = {
.fault = gru_fault,
};
-module_init(gru_init);
+fs_initcall(gru_init);
module_exit(gru_exit);
module_param(gru_options, ulong, 0644);