diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-20 19:44:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-20 19:44:28 -0500 |
| commit | 226364766f936d249e408de03821468c1bf11dda (patch) | |
| tree | 3b4feabb40a87f311ae92bb973c18293d05597e8 /lib | |
| parent | 3a142ed962958d3063f648738a3384ab90017100 (diff) | |
| parent | 1fb9341ac34825aa40354e74d9a2c69df7d2c304 (diff) | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull module fixes and a virtio block fix from Rusty Russell:
"Various minor fixes, but a slightly more complex one to fix the
per-cpu overload problem introduced recently by kvm id changes."
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
module: put modules in list much earlier.
module: add new state MODULE_STATE_UNFORMED.
module: prevent warning when finit_module a 0 sized file
virtio-blk: Don't free ida when disk is in use
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bug.c | 1 |
1 files changed, 1 insertions, 0 deletions
| @@ -55,6 +55,7 @@ static inline unsigned long bug_addr(const struct bug_entry *bug) | |||
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | #ifdef CONFIG_MODULES | 57 | #ifdef CONFIG_MODULES |
| 58 | /* Updates are protected by module mutex */ | ||
| 58 | static LIST_HEAD(module_bug_list); | 59 | static LIST_HEAD(module_bug_list); |
| 59 | 60 | ||
| 60 | static const struct bug_entry *module_find_bug(unsigned long bugaddr) | 61 | static const struct bug_entry *module_find_bug(unsigned long bugaddr) |