diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
| commit | f0cd91a68acdc9b49d7f6738b514a426da627649 (patch) | |
| tree | 8ad73564015794197583b094217ae0a71e71e753 /kernel/module.c | |
| parent | 60eef25701d25e99c991dd0f4a9f3832a0c3ad3e (diff) | |
| parent | 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'kernel/module.c')
| -rw-r--r-- | kernel/module.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/module.c b/kernel/module.c index d24deb0dbbc9..bbe04862e1b0 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
| @@ -705,14 +705,14 @@ EXPORT_SYMBOL(__symbol_put); | |||
| 705 | 705 | ||
| 706 | void symbol_put_addr(void *addr) | 706 | void symbol_put_addr(void *addr) |
| 707 | { | 707 | { |
| 708 | unsigned long flags; | 708 | struct module *modaddr; |
| 709 | 709 | ||
| 710 | spin_lock_irqsave(&modlist_lock, flags); | 710 | if (core_kernel_text((unsigned long)addr)) |
| 711 | if (!kernel_text_address((unsigned long)addr)) | 711 | return; |
| 712 | BUG(); | ||
| 713 | 712 | ||
| 714 | module_put(module_text_address((unsigned long)addr)); | 713 | if (!(modaddr = module_text_address((unsigned long)addr))) |
| 715 | spin_unlock_irqrestore(&modlist_lock, flags); | 714 | BUG(); |
| 715 | module_put(modaddr); | ||
| 716 | } | 716 | } |
| 717 | EXPORT_SYMBOL_GPL(symbol_put_addr); | 717 | EXPORT_SYMBOL_GPL(symbol_put_addr); |
| 718 | 718 | ||