diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-29 17:47:33 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-19 16:12:33 -0800 |
| commit | ab3b37937e8f4fb38dc9780b7bc3fd3c5195cca3 (patch) | |
| tree | d1d96406b6bfcfb93fcc71ea825c7f5c53cf9f06 /arch/x86/include | |
| parent | b72d0db9dd41da1f2ec6274b03e8909583c64e41 (diff) | |
| download | kernel_samsung_smdk4412-ab3b37937e8f4fb38dc9780b7bc3fd3c5195cca3.tar.gz kernel_samsung_smdk4412-ab3b37937e8f4fb38dc9780b7bc3fd3c5195cca3.tar.bz2 kernel_samsung_smdk4412-ab3b37937e8f4fb38dc9780b7bc3fd3c5195cca3.zip | |
x86: Add pci_init_irq to x86_init
Moorestown wants to reuse pcibios_init_irq but needs to provide its
own implementation of pci_enable_irq. After we distangled the init we
can move the init_irq call to x86_init and remove the pci_enable_irq
!= NULL check in pcibios_init_irq. pci_enable_irq is compile time
initialized to pirq_enable_irq and the special cases which override it
(visws and acpi) set the x86_init function pointer to noop. That
allows MSRT to override pci_enable_irq and otherwise run
pcibios_init_irq unmodified.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80CFF@orsmsx508.amr.corp.intel.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Jacob Pan <jacob.jun.pan@intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/pci_x86.h | 4 | ||||
| -rw-r--r-- | arch/x86/include/asm/x86_init.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h index 440124f1224..46511c5be45 100644 --- a/arch/x86/include/asm/pci_x86.h +++ b/arch/x86/include/asm/pci_x86.h @@ -110,7 +110,7 @@ extern void __init dmi_check_skip_isa_align(void); /* some common used subsys_initcalls */ extern int __init pci_acpi_init(void); -extern int __init pcibios_irq_init(void); +extern void __init pcibios_irq_init(void); extern int __init pcibios_init(void); extern int pci_legacy_init(void); @@ -187,6 +187,8 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val) # else # define x86_default_pci_init pci_legacy_init # endif +# define x86_default_pci_init_irq pcibios_irq_init #else # define x86_default_pci_init NULL +# define x86_default_pci_init_irq NULL #endif diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h index f145d843f03..34f61cd56f3 100644 --- a/arch/x86/include/asm/x86_init.h +++ b/arch/x86/include/asm/x86_init.h @@ -101,9 +101,11 @@ struct x86_init_iommu { /* * struct x86_init_pci - platform specific pci init functions * @init: platform specific pci init + * @init_irq: platform specific pci irq init */ struct x86_init_pci { int (*init)(void); + void (*init_irq)(void); }; /** |