diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-05 00:09:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-05 00:09:48 -0400 |
commit | 90ec7819737d42a0ad1c2df1ff56016facae3c6e (patch) | |
tree | 0dac92b38de5cb13764b5f3de33346359928deda /kernel/debug/kdb/kdb_main.c | |
parent | 8ce655e737dc395e115ecdce143a43b9b6127f46 (diff) | |
parent | 9bea7f23952d5948f8e5dfdff4de09bb9981fb5f (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
module: fix bne2 "gave up waiting for init of module libcrc32c"
module: verify_export_symbols under the lock
module: move find_module check to end
module: make locking more fine-grained.
module: Make module sysfs functions private.
module: move sysfs exposure to end of load_module
module: fix kdb's illicit use of struct module_use.
module: Make the 'usage' lists be two-way
Diffstat (limited to 'kernel/debug/kdb/kdb_main.c')
-rw-r--r-- | kernel/debug/kdb/kdb_main.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index b724c791b6d4..184cd8209c36 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c | |||
@@ -1857,12 +1857,6 @@ static int kdb_ef(int argc, const char **argv) | |||
1857 | } | 1857 | } |
1858 | 1858 | ||
1859 | #if defined(CONFIG_MODULES) | 1859 | #if defined(CONFIG_MODULES) |
1860 | /* modules using other modules */ | ||
1861 | struct module_use { | ||
1862 | struct list_head list; | ||
1863 | struct module *module_which_uses; | ||
1864 | }; | ||
1865 | |||
1866 | /* | 1860 | /* |
1867 | * kdb_lsmod - This function implements the 'lsmod' command. Lists | 1861 | * kdb_lsmod - This function implements the 'lsmod' command. Lists |
1868 | * currently loaded kernel modules. | 1862 | * currently loaded kernel modules. |
@@ -1894,9 +1888,9 @@ static int kdb_lsmod(int argc, const char **argv) | |||
1894 | { | 1888 | { |
1895 | struct module_use *use; | 1889 | struct module_use *use; |
1896 | kdb_printf(" [ "); | 1890 | kdb_printf(" [ "); |
1897 | list_for_each_entry(use, &mod->modules_which_use_me, | 1891 | list_for_each_entry(use, &mod->source_list, |
1898 | list) | 1892 | source_list) |
1899 | kdb_printf("%s ", use->module_which_uses->name); | 1893 | kdb_printf("%s ", use->target->name); |
1900 | kdb_printf("]\n"); | 1894 | kdb_printf("]\n"); |
1901 | } | 1895 | } |
1902 | #endif | 1896 | #endif |