diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-02 08:53:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-02 08:53:24 -0700 |
| commit | deb74f5ca1f22f9e1c5da93143a250dbb96535af (patch) | |
| tree | ee9eb01e5433ea50f3414a469521a4c1cfaccb7a /arch/alpha | |
| parent | dd775ae2549217d3ae09363e3edb305d0fa19928 (diff) | |
| parent | 615399c84d1b8d8d8752629e5e5ab4e5044d6918 (diff) | |
| download | op-kernel-dev-deb74f5ca1f22f9e1c5da93143a250dbb96535af.zip op-kernel-dev-deb74f5ca1f22f9e1c5da93143a250dbb96535af.tar.gz | |
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 'arch/alpha')
| -rw-r--r-- | arch/alpha/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c index 4087a56..50d438d 100644 --- a/arch/alpha/kernel/smp.c +++ b/arch/alpha/kernel/smp.c @@ -450,7 +450,7 @@ setup_smp(void) smp_num_probed = 1; } - printk(KERN_INFO "SMP: %d CPUs probed -- cpu_present_map = %lx\n", + printk(KERN_INFO "SMP: %d CPUs probed -- cpu_present_mask = %lx\n", smp_num_probed, cpumask_bits(cpu_present_mask)[0]); } |
