diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-29 11:47:33 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-19 19:12:33 -0500 |
commit | ab3b37937e8f4fb38dc9780b7bc3fd3c5195cca3 (patch) | |
tree | d1d96406b6bfcfb93fcc71ea825c7f5c53cf9f06 /arch/x86/include/asm/x86_init.h | |
parent | b72d0db9dd41da1f2ec6274b03e8909583c64e41 (diff) |
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/asm/x86_init.h')
-rw-r--r-- | arch/x86/include/asm/x86_init.h | 2 |
1 files changed, 2 insertions, 0 deletions
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 { | |||
101 | /* | 101 | /* |
102 | * struct x86_init_pci - platform specific pci init functions | 102 | * struct x86_init_pci - platform specific pci init functions |
103 | * @init: platform specific pci init | 103 | * @init: platform specific pci init |
104 | * @init_irq: platform specific pci irq init | ||
104 | */ | 105 | */ |
105 | struct x86_init_pci { | 106 | struct x86_init_pci { |
106 | int (*init)(void); | 107 | int (*init)(void); |
108 | void (*init_irq)(void); | ||
107 | }; | 109 | }; |
108 | 110 | ||
109 | /** | 111 | /** |