diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-05-08 18:11:19 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-05-08 18:11:19 +0200 |
commit | e7858f52a5cb868289a72264534a1f05f3340c6c (patch) | |
tree | aa7308603cf30d8aec6e45ecaddc6c8ed29d2edb /kernel/module.c | |
parent | 27a9da6538ee18046d7bff8e36a9f783542c54c3 (diff) | |
parent | bbf1bb3eee86f2eef2baa14e600be454d09109ee (diff) |
Merge branch 'cpu_stop' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into sched/core
Diffstat (limited to 'kernel/module.c')
-rw-r--r-- | kernel/module.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/kernel/module.c b/kernel/module.c index 1016b75b026a..0838246d8c94 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -723,16 +723,8 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user, return -EFAULT; name[MODULE_NAME_LEN-1] = '\0'; - /* Create stop_machine threads since free_module relies on - * a non-failing stop_machine call. */ - ret = stop_machine_create(); - if (ret) - return ret; - - if (mutex_lock_interruptible(&module_mutex) != 0) { - ret = -EINTR; - goto out_stop; - } + if (mutex_lock_interruptible(&module_mutex) != 0) + return -EINTR; mod = find_module(name); if (!mod) { @@ -792,8 +784,6 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user, out: mutex_unlock(&module_mutex); -out_stop: - stop_machine_destroy(); return ret; } |