Merge branch 'irq/sparseirq' into cpus4096

Conflicts:
	arch/x86/kernel/io_apic.c

Merge irq/sparseirq here, to resolve conflicts.

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/io_apic.c
index 60bb8b19f4cdde5799c8222e5e8682db04fabbd7,bfe1245b1a3e7dc4fe2bfa723770d28980a32a31..6bd51ce3ce32a631f19306ebde347f24441b9397
--- 1/arch/x86/kernel/io_apic.c
--- 2/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@@ -249,10 -349,11 +367,12 @@@ static struct irq_cfg *irq_cfg(unsigne
  
  #endif
  
 -static inline void set_extra_move_desc(struct irq_desc *desc, cpumask_t mask)
+ #ifndef CONFIG_NUMA_MIGRATE_IRQ_DESC
 +static inline void
 +set_extra_move_desc(struct irq_desc *desc, const struct cpumask *mask)
  {
  }
+ #endif
  
  struct io_apic {
        unsigned int index;
@@@ -2402,8 -2485,20 +2536,14 @@@ static void irq_complete_move(struct ir
  
        vector = ~get_irq_regs()->orig_ax;
        me = smp_processor_id();
 -      if ((vector == cfg->vector) && cpu_isset(me, cfg->domain)) {
 -              cpumask_t cleanup_mask;
 -
+ #ifdef CONFIG_NUMA_MIGRATE_IRQ_DESC
+               *descp = desc = move_irq_desc(desc, me);
+               /* get the new one */
+               cfg = desc->chip_data;
+ #endif
+ 
 -              cpus_and(cleanup_mask, cfg->old_domain, cpu_online_map);
 -              cfg->move_cleanup_count = cpus_weight(cleanup_mask);
 -              send_IPI_mask(cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR);
 -              cfg->move_in_progress = 0;
 -      }
 +      if (vector == cfg->vector && cpumask_test_cpu(me, cfg->domain))
 +              send_cleanup_vector(cfg);
  }
  #else
  static inline void irq_complete_move(struct irq_desc **descp) {}

diff --cc include/linux/irq.h
Simple merge

diff --cc kernel/irq/chip.c
Simple merge