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 /include/linux | |
| parent | 3a142ed962958d3063f648738a3384ab90017100 (diff) | |
| parent | 1fb9341ac34825aa40354e74d9a2c69df7d2c304 (diff) | |
| download | linux-stable-226364766f936d249e408de03821468c1bf11dda.tar.gz linux-stable-226364766f936d249e408de03821468c1bf11dda.tar.bz2 linux-stable-226364766f936d249e408de03821468c1bf11dda.zip | |
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 'include/linux')
| -rw-r--r-- | include/linux/module.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 7760c6d344a3..1375ee3f03aa 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -199,11 +199,11 @@ struct module_use { struct module *source, *target; }; -enum module_state -{ - MODULE_STATE_LIVE, - MODULE_STATE_COMING, - MODULE_STATE_GOING, +enum module_state { + MODULE_STATE_LIVE, /* Normal state. */ + MODULE_STATE_COMING, /* Full formed, running module_init. */ + MODULE_STATE_GOING, /* Going away. */ + MODULE_STATE_UNFORMED, /* Still setting it up. */ }; /** |