diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-05-01 08:29:55 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-05-01 08:29:55 -0400 |
| commit | 0b7877d4eea3f93e3dd941999522bbd8c538cb53 (patch) | |
| tree | ade6d4e411b9b9b569c802e3b2179826162c934c /init/Kconfig | |
| parent | bd1a68b59c8e3bce45fb76632c64e1e063c3962d (diff) | |
| parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) | |
Merge tag 'v3.4-rc5' into for-3.5/core
The core branch is behind driver commits that we want to build
on for 3.5, hence I'm pulling in a later -rc.
Linux 3.4-rc5
Conflicts:
Documentation/feature-removal-schedule.txt
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index 2acd917ebf2d..038e2592664e 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -1414,8 +1414,8 @@ endif # MODULES | |||
| 1414 | config INIT_ALL_POSSIBLE | 1414 | config INIT_ALL_POSSIBLE |
| 1415 | bool | 1415 | bool |
| 1416 | help | 1416 | help |
| 1417 | Back when each arch used to define their own cpu_online_map and | 1417 | Back when each arch used to define their own cpu_online_mask and |
| 1418 | cpu_possible_map, some of them chose to initialize cpu_possible_map | 1418 | cpu_possible_mask, some of them chose to initialize cpu_possible_mask |
| 1419 | with all 1s, and others with all 0s. When they were centralised, | 1419 | with all 1s, and others with all 0s. When they were centralised, |
| 1420 | it was better to provide this option than to break all the archs | 1420 | it was better to provide this option than to break all the archs |
| 1421 | and have several arch maintainers pursuing me down dark alleys. | 1421 | and have several arch maintainers pursuing me down dark alleys. |