diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /kernel/module.c | |
parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'kernel/module.c')
-rw-r--r-- | kernel/module.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/module.c b/kernel/module.c index 1f9f7bc56ca1..d5938a5c19c4 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -809,7 +809,7 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user, | |||
809 | wait_for_zero_refcount(mod); | 809 | wait_for_zero_refcount(mod); |
810 | 810 | ||
811 | mutex_unlock(&module_mutex); | 811 | mutex_unlock(&module_mutex); |
812 | /* Final destruction now noone is using it. */ | 812 | /* Final destruction now no one is using it. */ |
813 | if (mod->exit != NULL) | 813 | if (mod->exit != NULL) |
814 | mod->exit(); | 814 | mod->exit(); |
815 | blocking_notifier_call_chain(&module_notify_list, | 815 | blocking_notifier_call_chain(&module_notify_list, |
@@ -2777,7 +2777,7 @@ static struct module *load_module(void __user *umod, | |||
2777 | mod->state = MODULE_STATE_COMING; | 2777 | mod->state = MODULE_STATE_COMING; |
2778 | 2778 | ||
2779 | /* Now sew it into the lists so we can get lockdep and oops | 2779 | /* Now sew it into the lists so we can get lockdep and oops |
2780 | * info during argument parsing. Noone should access us, since | 2780 | * info during argument parsing. No one should access us, since |
2781 | * strong_try_module_get() will fail. | 2781 | * strong_try_module_get() will fail. |
2782 | * lockdep/oops can run asynchronous, so use the RCU list insertion | 2782 | * lockdep/oops can run asynchronous, so use the RCU list insertion |
2783 | * function to insert in a way safe to concurrent readers. | 2783 | * function to insert in a way safe to concurrent readers. |
@@ -2971,7 +2971,7 @@ static const char *get_ksymbol(struct module *mod, | |||
2971 | else | 2971 | else |
2972 | nextval = (unsigned long)mod->module_core+mod->core_text_size; | 2972 | nextval = (unsigned long)mod->module_core+mod->core_text_size; |
2973 | 2973 | ||
2974 | /* Scan for closest preceeding symbol, and next symbol. (ELF | 2974 | /* Scan for closest preceding symbol, and next symbol. (ELF |
2975 | starts real symbols at 1). */ | 2975 | starts real symbols at 1). */ |
2976 | for (i = 1; i < mod->num_symtab; i++) { | 2976 | for (i = 1; i < mod->num_symtab; i++) { |
2977 | if (mod->symtab[i].st_shndx == SHN_UNDEF) | 2977 | if (mod->symtab[i].st_shndx == SHN_UNDEF) |