diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-20 16:44:28 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-20 16:44:28 -0800 |
commit | 226364766f936d249e408de03821468c1bf11dda (patch) | |
tree | 3b4feabb40a87f311ae92bb973c18293d05597e8 /kernel/debug/kdb/kdb_main.c | |
parent | 3a142ed962958d3063f648738a3384ab90017100 (diff) | |
parent | 1fb9341ac34825aa40354e74d9a2c69df7d2c304 (diff) | |
download | op-kernel-dev-226364766f936d249e408de03821468c1bf11dda.zip op-kernel-dev-226364766f936d249e408de03821468c1bf11dda.tar.gz |
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 'kernel/debug/kdb/kdb_main.c')
-rw-r--r-- | kernel/debug/kdb/kdb_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index 4d5f8d5..8875254 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c @@ -1970,6 +1970,8 @@ static int kdb_lsmod(int argc, const char **argv) kdb_printf("Module Size modstruct Used by\n"); list_for_each_entry(mod, kdb_modules, list) { + if (mod->state == MODULE_STATE_UNFORMED) + continue; kdb_printf("%-20s%8u 0x%p ", mod->name, mod->core_size, (void *)mod); |