Commit f0d5e12b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (76 commits)
  x86, apic: Fix dummy apic read operation together with broken MP handling
  x86, apic: Restore irqs on fail paths
  x86: Print real IOAPIC version for x86-64
  x86: enable_update_mptable should be a macro
  sparseirq: Allow early irq_desc allocation
  x86, io-apic: Don't mark pin_programmed early
  x86, irq: don't call mp_config_acpi_gsi() if update_mptable is not enabled
  x86, irq: update_mptable needs pci_routeirq
  x86: don't call read_apic_id if !cpu_has_apic
  x86, apic: introduce io_apic_irq_attr
  x86/pci: add 4 more return parameters to IO_APIC_get_PCI_irq_vector(), fix
  x86: read apic ID in the !acpi_lapic case
  x86: apic: Fixmap apic address even if apic disabled
  x86: display extended apic registers with print_local_APIC and cpu_debug code
  x86: read apic ID in the !acpi_lapic case
  x86: clean up and fix setup_clear/force_cpu_cap handling
  x86: apic: Check rev 3 fadt correctly for physical_apic bit
  x86/pci: update pirq_enable_irq() to setup io apic routing
  x86/acpi: move setup io apic routing out of CONFIG_ACPI scope
  x86/pci: add 4 more return parameters to IO_APIC_get_PCI_irq_vector()
  ...
parents 0fea615e 103428e5

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -1575,6 +1575,9 @@ and is between 256 and 4096 characters. It is defined in the file 
	noinitrd	[RAM] Tells the kernel not to load any configured

			initial RAM disk.



	nointremap	[X86-64, Intel-IOMMU] Do not enable interrupt

			remapping.



	nointroute	[IA-64]



	nojitter	[IA64] Disables jitter checking for ITC timers.

arch/alpha/kernel/sys_dp264.c

+6 −2
Original line number Diff line number Diff line
@@ -176,22 +176,26 @@ cpu_set_irq_affinity(unsigned int irq, cpumask_t affinity) 
	}

}



static void

static int

dp264_set_affinity(unsigned int irq, const struct cpumask *affinity)

{ 

	spin_lock(&dp264_irq_lock);

	cpu_set_irq_affinity(irq, *affinity);

	tsunami_update_irq_hw(cached_irq_mask);

	spin_unlock(&dp264_irq_lock);



	return 0;

}



static void

static int

clipper_set_affinity(unsigned int irq, const struct cpumask *affinity)

{ 

	spin_lock(&dp264_irq_lock);

	cpu_set_irq_affinity(irq - 16, *affinity);

	tsunami_update_irq_hw(cached_irq_mask);

	spin_unlock(&dp264_irq_lock);



	return 0;

}



static struct hw_interrupt_type dp264_irq_type = {

arch/alpha/kernel/sys_titan.c

+3 −1
Original line number Diff line number Diff line
@@ -157,13 +157,15 @@ titan_cpu_set_irq_affinity(unsigned int irq, cpumask_t affinity) 


}



static void

static int

titan_set_irq_affinity(unsigned int irq, const struct cpumask *affinity)

{ 

	spin_lock(&titan_irq_lock);

	titan_cpu_set_irq_affinity(irq - 16, *affinity);

	titan_update_irq_hw(titan_cached_irq_mask);

	spin_unlock(&titan_irq_lock);



	return 0;

}



static void

arch/arm/common/gic.c

+3 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static void gic_unmask_irq(unsigned int irq) 
}



#ifdef CONFIG_SMP

static void gic_set_cpu(unsigned int irq, const struct cpumask *mask_val)

static int gic_set_cpu(unsigned int irq, const struct cpumask *mask_val)

{

	void __iomem *reg = gic_dist_base(irq) + GIC_DIST_TARGET + (gic_irq(irq) & ~3);

	unsigned int shift = (irq % 4) * 8;
@@ -122,6 +122,8 @@ static void gic_set_cpu(unsigned int irq, const struct cpumask *mask_val) 
	val |= 1 << (cpu + shift);

	writel(val, reg);

	spin_unlock(&irq_controller_lock);



	return 0;

}

#endif

arch/cris/arch-v32/kernel/irq.c

+3 −1
Original line number Diff line number Diff line
@@ -325,12 +325,14 @@ static void end_crisv32_irq(unsigned int irq) 
{

}



void set_affinity_crisv32_irq(unsigned int irq, const struct cpumask *dest)

int set_affinity_crisv32_irq(unsigned int irq, const struct cpumask *dest)

{

	unsigned long flags;

	spin_lock_irqsave(&irq_lock, flags);

	irq_allocations[irq - FIRST_IRQ].mask = *dest;

	spin_unlock_irqrestore(&irq_lock, flags);



	return 0;

}



static struct irq_chip crisv32_irq_type = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE