* [tip:x86/mrst] x86, pci: Add arch_init to x86_init abstraction
[not found] <43F901BD926A4E43B106BF17856F0755A318CE84@orsmsx508.amr.corp.intel.com>
@ 2010-02-26 4:45 ` tip-bot for Thomas Gleixner
0 siblings, 0 replies; only message in thread
From: tip-bot for Thomas Gleixner @ 2010-02-26 4:45 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, jbarnes, jacob.jun.pan, tglx
Commit-ID: 4fb6088a5cb3a77123fea1279bf2d5b16cf27648
Gitweb: http://git.kernel.org/tip/4fb6088a5cb3a77123fea1279bf2d5b16cf27648
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Mon, 22 Feb 2010 05:38:38 -0800
Committer: H. Peter Anvin <hpa@zytor.com>
CommitDate: Thu, 25 Feb 2010 19:24:43 -0800
x86, pci: Add arch_init to x86_init abstraction
Added an abstraction function for arch specific init calls.
Signed-off-by: Jacob Pan <jacob.jun.pan@intel.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
LKML-Reference: <43F901BD926A4E43B106BF17856F0755A318CE84@orsmsx508.amr.corp.intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
arch/x86/include/asm/x86_init.h | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 8ef56f2..b1d62bb 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -98,13 +98,15 @@ struct x86_init_iommu {
int (*iommu_init)(void);
};
- /*
- * struct x86_init_pci - platform specific pci init functions
- * @init: platform specific pci init
+/**
+ * struct x86_init_pci - platform specific pci init functions
+ * @arch_init: platform specific pci arch init call
+ * @init: platform specific pci subsystem init
* @init_irq: platform specific pci irq init
* @fixup_irqs: platform specific pci irq fixup
*/
struct x86_init_pci {
+ int (*arch_init)(void);
int (*init)(void);
void (*init_irq)(void);
void (*fixup_irqs)(void);
^ permalink raw reply related [flat|nested] only message in thread