diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 15:41:02 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 15:41:02 -0500 |
| commit | 67635d397a643514fdfa859f611b86bd3ad8958d (patch) | |
| tree | b5df6d79b35cde39c00f0cc1432f128f473d4d6e /lib/bug.c | |
| parent | 192fef18d0f5ac9a05a93ff6314fc9865c10fbf9 (diff) | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
Merge 3.8-rc5 into usb-next
This fixes up a conflict with drivers/usb/serial/io_ti.c that came up in
linux-next.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib/bug.c')
| -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) |