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

[karo-tx-linux.git] / arch / x86 / mach-default / setup.c

diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c
index 2f5e277686b8ef3e8325e119106ee292bed016be..3d317836be9ed9e1739e92461d0912dc37c65ffb 100644 (file)
--- a/arch/x86/mach-default/setup.c
+++ b/arch/x86/mach-default/setup.c
@@ -29,6 +29,10 @@ int no_broadcast=DEFAULT_SEND_IPI;
  **/
 void __init pre_intr_init_hook(void)
 {
+       if (x86_quirks->arch_pre_intr_init) {
+               if (x86_quirks->arch_pre_intr_init())
+                       return;
+       }
        init_ISA_irqs();
 }
 
@@ -52,6 +56,10 @@ static struct irqaction irq2 = {
  **/
 void __init intr_init_hook(void)
 {
+       if (x86_quirks->arch_intr_init) {
+               if (x86_quirks->arch_intr_init())
+                       return;
+       }
 #ifdef CONFIG_X86_LOCAL_APIC
        apic_intr_init();
 #endif
@@ -65,7 +73,7 @@ void __init intr_init_hook(void)
  *
  * Description:
  *     generally used to activate any machine specific identification
- *     routines that may be needed before setup_arch() runs.  On VISWS
+ *     routines that may be needed before setup_arch() runs.  On Voyager
  *     this is used to get the board revision and type.
  **/
 void __init pre_setup_arch_hook(void)
@@ -81,6 +89,10 @@ void __init pre_setup_arch_hook(void)
  **/
 void __init trap_init_hook(void)
 {
+       if (x86_quirks->arch_trap_init) {
+               if (x86_quirks->arch_trap_init())
+                       return;
+       }
 }
 
 static struct irqaction irq0  = {
@@ -90,6 +102,16 @@ static struct irqaction irq0  = {
        .name = "timer"
 };
 
+/**
+ * pre_time_init_hook - do any specific initialisations before.
+ *
+ **/
+void __init pre_time_init_hook(void)
+{
+       if (x86_quirks->arch_pre_time_init)
+               x86_quirks->arch_pre_time_init();
+}
+
 /**
  * time_init_hook - do any specific initialisations for the system timer.
  *
@@ -99,6 +121,16 @@ static struct irqaction irq0  = {
  **/
 void __init time_init_hook(void)
 {
+       if (x86_quirks->arch_time_init) {
+               /*
+                * A nonzero return code does not mean failure, it means
+                * that the architecture quirk does not want any
+                * generic (timer) setup to be performed after this:
+                */
+               if (x86_quirks->arch_time_init())
+                       return;
+       }
+
        irq0.mask = cpumask_of_cpu(0);
        setup_irq(0, &irq0);
 }