diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 14:35:15 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 14:35:15 +1100 |
| commit | 5f326153c1ce431b4e3d587d20ea876f03d950a4 (patch) | |
| tree | 8b30e55dc3447311b2511b622b485c834af839fd /init | |
| parent | 3ce47ce285af9ef7b758f2952a68281ae74eef0d (diff) | |
| parent | 0e94068d0522f152ffe279556e5550a8056026db (diff) | |
Merge branch 'quilt/rr'
Conflicts:
arch/x86/kernel/setup.c
kernel/cpu.c
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 6 | ||||
| -rw-r--r-- | init/main.c | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/init/Kconfig b/init/Kconfig index 15f73066aada..ce75d2dff948 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -919,12 +919,6 @@ config MODULE_SRCVERSION_ALL the version). With this option, such a "srcversion" field will be created for all modules. If unsure, say N. -config KMOD - def_bool y - help - This is being removed soon. These days, CONFIG_MODULES - implies CONFIG_KMOD, so use that instead. - endif # MODULES config INIT_ALL_POSSIBLE diff --git a/init/main.c b/init/main.c index 59414b5cf40d..5a819ac2b696 100644 --- a/init/main.c +++ b/init/main.c @@ -528,9 +528,9 @@ static void __init boot_cpu_init(void) { int cpu = smp_processor_id(); /* Mark the boot cpu "present", "online" etc for SMP and UP case */ - cpu_set(cpu, cpu_online_map); - cpu_set(cpu, cpu_present_map); - cpu_set(cpu, cpu_possible_map); + set_cpu_online(cpu, true); + set_cpu_present(cpu, true); + set_cpu_possible(cpu, true); } void __init __weak smp_setup_processor_id(void) |