diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-23 11:46:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-23 11:46:59 -0400 |
| commit | 87ce786ae5f24e336195805a9fc7428a6f922478 (patch) | |
| tree | 4e756c5b49dadcd4b9cf46a1a0e3593ccadfb291 /kernel/module.c | |
| parent | 8067794bec1cc5de1431102cf0a6a1c7ce75cd85 (diff) | |
| parent | f1c5d30e1d79bbfb60eaf189db862d3cb2bcac92 (diff) | |
Merge branch 'x86/cpu' into x86/x2apic
Diffstat (limited to 'kernel/module.c')
| -rw-r--r-- | kernel/module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/module.c b/kernel/module.c index 61d212120df4..08864d257eb0 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
| @@ -2288,7 +2288,7 @@ sys_init_module(void __user *umod, | |||
| 2288 | 2288 | ||
| 2289 | /* Start the module */ | 2289 | /* Start the module */ |
| 2290 | if (mod->init != NULL) | 2290 | if (mod->init != NULL) |
| 2291 | ret = mod->init(); | 2291 | ret = do_one_initcall(mod->init); |
| 2292 | if (ret < 0) { | 2292 | if (ret < 0) { |
| 2293 | /* Init routine failed: abort. Try to protect us from | 2293 | /* Init routine failed: abort. Try to protect us from |
| 2294 | buggy refcounters. */ | 2294 | buggy refcounters. */ |