diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-27 08:34:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-27 08:34:16 -0700 |
| commit | 43a1141b9f4fd9453b43ba5e8f136e7d47220dde (patch) | |
| tree | 0833be3af2ccbed3562d8bff41a1392fcb63d19d /include/linux/init.h | |
| parent | 25918f9811eae1d657db2bccdfcb077038d9454c (diff) | |
| parent | 231daf0751ccaf21373f591c524a3f557a15d03f (diff) | |
| download | linux-stable-43a1141b9f4fd9453b43ba5e8f136e7d47220dde.tar.gz linux-stable-43a1141b9f4fd9453b43ba5e8f136e7d47220dde.tar.bz2 linux-stable-43a1141b9f4fd9453b43ba5e8f136e7d47220dde.zip | |
Merge tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
Pull cpumask changes from Rusty Russell:
"Trivial comment changes to cpumask code. I guess it's getting boring."
Boring is good.
* tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
cpumask: cpulist_parse() comments correction
init: add comments to keep initcall-names in sync with initcall levels
cpumask: add a few comments of cpumask functions
Diffstat (limited to 'include/linux/init.h')
| -rw-r--r-- | include/linux/init.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index 6b951095a42f..5e664f671615 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -191,6 +191,7 @@ extern bool initcall_debug; * initializes variables that couldn't be statically initialized. * * This only exists for built-in code, not for modules. + * Keep main.c:initcall_level_names[] in sync. */ #define pure_initcall(fn) __define_initcall("0",fn,0) @@ -280,7 +281,7 @@ void __init parse_early_options(char *cmdline); #else /* MODULE */ -/* Don't use these in modules, but some people do... */ +/* Don't use these in loadable modules, but some people do... */ #define early_initcall(fn) module_init(fn) #define core_initcall(fn) module_init(fn) #define postcore_initcall(fn) module_init(fn) |