diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 08:40:19 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 08:40:19 -0700 |
commit | 1c89ac55017f982355c7761e1c912c88c941483d (patch) | |
tree | 6878e95a0572defc725ea58f5a1449db937a5066 /kernel | |
parent | 88fa08f67bee1a0c765237bdac106a32872f57d2 (diff) | |
parent | b1b135c8d619cb2c7045d6ee4e48375882518bb5 (diff) | |
download | kernel-crypto-1c89ac55017f982355c7761e1c912c88c941483d.tar.gz kernel-crypto-1c89ac55017f982355c7761e1c912c88c941483d.tar.xz kernel-crypto-1c89ac55017f982355c7761e1c912c88c941483d.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
fix spinlock recursion in hvc_console
stop_machine: remove unused variable
modules: extend initcall_debug functionality to the module loader
export virtio_rng.h
lguest: use get_user_pages_fast() instead of get_user_pages()
mm: Make generic weak get_user_pages_fast and EXPORT_GPL it
lguest: don't set MAC address for guest unless specified
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/module.c | 2 | ||||
-rw-r--r-- | kernel/stop_machine.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/kernel/module.c b/kernel/module.c index 61d212120df..08864d257eb 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -2288,7 +2288,7 @@ sys_init_module(void __user *umod, /* Start the module */ if (mod->init != NULL) - ret = mod->init(); + ret = do_one_initcall(mod->init); if (ret < 0) { /* Init routine failed: abort. Try to protect us from buggy refcounters. */ diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index e446c7c7d6a..af3c7cea258 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -65,7 +65,6 @@ static void ack_state(void) static int stop_cpu(struct stop_machine_data *smdata) { enum stopmachine_state curstate = STOPMACHINE_NONE; - int uninitialized_var(ret); /* Simple state machine */ do { |