diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2008-07-28 13:16:30 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-07-27 22:16:31 -0400 |
commit | 9b1a4d38373a5581a4e01032a3ccdd94cd93477b (patch) | |
tree | 3d0f0ebd1ac4512551fc35e57d173870eb060c0c /kernel/module.c | |
parent | eeec4fad963490821348a331cca6102ae1c4a7a3 (diff) |
stop_machine: Wean existing callers off stop_machine_run()
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'kernel/module.c')
-rw-r--r-- | kernel/module.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/module.c b/kernel/module.c index d861bd5b8c10..61d212120df4 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -678,7 +678,7 @@ static int try_stop_module(struct module *mod, int flags, int *forced) | |||
678 | if (flags & O_NONBLOCK) { | 678 | if (flags & O_NONBLOCK) { |
679 | struct stopref sref = { mod, flags, forced }; | 679 | struct stopref sref = { mod, flags, forced }; |
680 | 680 | ||
681 | return stop_machine_run(__try_stop_module, &sref, NR_CPUS); | 681 | return stop_machine(__try_stop_module, &sref, NULL); |
682 | } else { | 682 | } else { |
683 | /* We don't need to stop the machine for this. */ | 683 | /* We don't need to stop the machine for this. */ |
684 | mod->state = MODULE_STATE_GOING; | 684 | mod->state = MODULE_STATE_GOING; |
@@ -1416,7 +1416,7 @@ static int __unlink_module(void *_mod) | |||
1416 | static void free_module(struct module *mod) | 1416 | static void free_module(struct module *mod) |
1417 | { | 1417 | { |
1418 | /* Delete from various lists */ | 1418 | /* Delete from various lists */ |
1419 | stop_machine_run(__unlink_module, mod, NR_CPUS); | 1419 | stop_machine(__unlink_module, mod, NULL); |
1420 | remove_notes_attrs(mod); | 1420 | remove_notes_attrs(mod); |
1421 | remove_sect_attrs(mod); | 1421 | remove_sect_attrs(mod); |
1422 | mod_kobject_remove(mod); | 1422 | mod_kobject_remove(mod); |
@@ -2197,7 +2197,7 @@ static struct module *load_module(void __user *umod, | |||
2197 | /* Now sew it into the lists so we can get lockdep and oops | 2197 | /* Now sew it into the lists so we can get lockdep and oops |
2198 | * info during argument parsing. Noone should access us, since | 2198 | * info during argument parsing. Noone should access us, since |
2199 | * strong_try_module_get() will fail. */ | 2199 | * strong_try_module_get() will fail. */ |
2200 | stop_machine_run(__link_module, mod, NR_CPUS); | 2200 | stop_machine(__link_module, mod, NULL); |
2201 | 2201 | ||
2202 | /* Size of section 0 is 0, so this works well if no params */ | 2202 | /* Size of section 0 is 0, so this works well if no params */ |
2203 | err = parse_args(mod->name, mod->args, | 2203 | err = parse_args(mod->name, mod->args, |
@@ -2231,7 +2231,7 @@ static struct module *load_module(void __user *umod, | |||
2231 | return mod; | 2231 | return mod; |
2232 | 2232 | ||
2233 | unlink: | 2233 | unlink: |
2234 | stop_machine_run(__unlink_module, mod, NR_CPUS); | 2234 | stop_machine(__unlink_module, mod, NULL); |
2235 | module_arch_cleanup(mod); | 2235 | module_arch_cleanup(mod); |
2236 | cleanup: | 2236 | cleanup: |
2237 | kobject_del(&mod->mkobj.kobj); | 2237 | kobject_del(&mod->mkobj.kobj); |