Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (96 commits)
  apic, x86: Use BIOS settings for IBS and MCE threshold interrupt LVT offsets
  apic, x86: Check if EILVT APIC registers are available (AMD only)
  x86: ioapic: Call free_irte only if interrupt remapping enabled
  arm: Use ARCH_IRQ_INIT_FLAGS
  genirq, ARM: Fix boot on ARM platforms
  genirq: Fix CONFIG_GENIRQ_NO_DEPRECATED=y build
  x86: Switch sparse_irq allocations to GFP_KERNEL
  genirq: Switch sparse_irq allocator to GFP_KERNEL
  genirq: Make sparse_lock a mutex
  x86: lguest: Use new irq allocator
  genirq: Remove the now unused sparse irq leftovers
  genirq: Sanitize dynamic irq handling
  genirq: Remove arch_init_chip_data()
  x86: xen: Sanitise sparse_irq handling
  x86: Use sane enumeration
  x86: uv: Clean up the direct access to irq_desc
  x86: Make io_apic.c local functions static
  genirq: Remove irq_2_iommu
  x86: Speed up the irq_remapped check in hot pathes
  intr_remap: Simplify the code further
  ...

Fix up trivial conflicts in arch/x86/Kconfig

1 files changed, 13 insertions, 11 deletions

diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 44edb03fc9ec..83ec0175f986 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -159,7 +159,7 @@ int show_interrupts(struct seq_file *p, void *v)
         seq_printf(p, "%*d: ", prec, i);
         for_each_online_cpu(j)
                 seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
-        seq_printf(p, " %8s", desc->chip->name);
+        seq_printf(p, " %8s", desc->irq_data.chip->name);
         seq_printf(p, "-%-8s", desc->name);
 
         if (action) {
@@ -282,6 +282,7 @@ void fixup_irqs(void)
         unsigned int irq, vector;
         static int warned;
         struct irq_desc *desc;
+        struct irq_data *data;
 
         for_each_irq_desc(irq, desc) {
                 int break_affinity = 0;
@@ -296,7 +297,8 @@ void fixup_irqs(void)
                 /* interrupt's are disabled at this point */
                 raw_spin_lock(&desc->lock);
 
-                affinity = desc->affinity;
+                data = &desc->irq_data;
+                affinity = data->affinity;
                 if (!irq_has_action(irq) ||
                     cpumask_equal(affinity, cpu_online_mask)) {
                         raw_spin_unlock(&desc->lock);
@@ -315,16 +317,16 @@ void fixup_irqs(void)
                         affinity = cpu_all_mask;
                 }
 
-                if (!(desc->status & IRQ_MOVE_PCNTXT) && desc->chip->mask)
-                        desc->chip->mask(irq);
+                if (!(desc->status & IRQ_MOVE_PCNTXT) && data->chip->irq_mask)
+                        data->chip->irq_mask(data);
 
-                if (desc->chip->set_affinity)
-                        desc->chip->set_affinity(irq, affinity);
+                if (data->chip->irq_set_affinity)
+                        data->chip->irq_set_affinity(data, affinity, true);
                 else if (!(warned++))
                         set_affinity = 0;
 
-                if (!(desc->status & IRQ_MOVE_PCNTXT) && desc->chip->unmask)
-                        desc->chip->unmask(irq);
+                if (!(desc->status & IRQ_MOVE_PCNTXT) && data->chip->irq_unmask)
+                        data->chip->irq_unmask(data);
 
                 raw_spin_unlock(&desc->lock);
 
@@ -355,10 +357,10 @@ void fixup_irqs(void)
                 if (irr  & (1 << (vector % 32))) {
                         irq = __get_cpu_var(vector_irq)[vector];
 
-                        desc = irq_to_desc(irq);
+                        data = irq_get_irq_data(irq);
                         raw_spin_lock(&desc->lock);
-                        if (desc->chip->retrigger)
-                                desc->chip->retrigger(irq);
+                        if (data->chip->irq_retrigger)
+                                data->chip->irq_retrigger(data);
                         raw_spin_unlock(&desc->lock);
                 }
         }