• Linus Torvalds's avatar
    Merge branch 'percpu-cpumask-x86-for-linus-2' of... · 7c730ccd
    Linus Torvalds authored
    Merge branch 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (682 commits)
      percpu: fix spurious alignment WARN in legacy SMP percpu allocator
      percpu: generalize embedding first chunk setup helper
      percpu: more flexibility for @dyn_size of pcpu_setup_first_chunk()
      percpu: make x86 addr <-> pcpu ptr conversion macros generic
      linker script: define __per_cpu_load on all SMP capable archs
      x86: UV: remove uv_flush_tlb_others() WARN_ON
      percpu: finer grained locking to break deadlock and allow atomic free
      percpu: move fully free chunk reclamation into a work
      percpu: move chunk area map extension out of area allocation
      percpu: replace pcpu_realloc() with pcpu_mem_alloc() and pcpu_mem_free()
      x86, percpu: setup reserved percpu area for x86_64
      percpu, module: implement reserved allocation and use it for module percpu variables
      percpu: add an indirection ptr for chunk page map access
      x86: make embedding percpu allocator return excessive free space
      percpu: use negative for auto for pcpu_setup_first_chunk() arguments
      percpu: improve first chunk initial area map handling
      percpu: cosmetic renames in pcpu_setup_first_chunk()
      percpu: clean up percpu constants
      x86: un-__init fill_pud/pmd/pte
      x86: remove vestigial fix_ioremap prototypes
      ...
    
    Manually merge conflicts in arch/ia64/kernel/irq_ia64.c
    7c730ccd
irq_ia64.c 15.8 KB