summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-02 08:53:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-02 08:53:24 -0700
commitdeb74f5ca1f22f9e1c5da93143a250dbb96535af (patch)
treeee9eb01e5433ea50f3414a469521a4c1cfaccb7a /init
parentdd775ae2549217d3ae09363e3edb305d0fa19928 (diff)
parent615399c84d1b8d8d8752629e5e5ab4e5044d6918 (diff)
downloadlinux-3.10-deb74f5ca1f22f9e1c5da93143a250dbb96535af.tar.gz
linux-3.10-deb74f5ca1f22f9e1c5da93143a250dbb96535af.tar.bz2
linux-3.10-deb74f5ca1f22f9e1c5da93143a250dbb96535af.zip
Merge tag 'for-linus' of git://github.com/rustyrussell/linux
Pull cpumask cleanups from Rusty Russell: "(Somehow forgot to send this out; it's been sitting in linux-next, and if you don't want it, it can sit there another cycle)" I'm a sucker for things that actually delete lines of code. Fix up trivial conflict in arch/arm/kernel/kprobes.c, where Rusty fixed a user of &cpu_online_map to be cpu_online_mask, but that code got deleted by commit b21d55e98ac2 ("ARM: 7332/1: extract out code patch function from kprobes"). * tag 'for-linus' of git://github.com/rustyrussell/linux: cpumask: remove old cpu_*_map. documentation: remove references to cpu_*_map. drivers/cpufreq/db8500-cpufreq: remove references to cpu_*_map. remove references to cpu_*_map in arch/
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 72f33faca44..6cfd71d0646 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1414,8 +1414,8 @@ endif # MODULES
config INIT_ALL_POSSIBLE
bool
help
- Back when each arch used to define their own cpu_online_map and
- cpu_possible_map, some of them chose to initialize cpu_possible_map
+ Back when each arch used to define their own cpu_online_mask and
+ cpu_possible_mask, some of them chose to initialize cpu_possible_mask
with all 1s, and others with all 0s. When they were centralised,
it was better to provide this option than to break all the archs
and have several arch maintainers pursuing me down dark alleys.