• Linus Torvalds's avatar
    Merge tag 'for-linus' of git://github.com/rustyrussell/linux · deb74f5c
    Linus Torvalds authored
    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 b21d55e9 ("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/
    deb74f5c
kprobes.c 16.5 KB