projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core
[deliverable/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 48278fa7d3dee05eeaf2ccfa9bb8c726f6dd2f84..37b9ae4d44c5b755470cb3661328b073e951b068 100644
(file)
--- a/
arch/x86/mach-default/setup.c
+++ b/
arch/x86/mach-default/setup.c
@@
-10,13
+10,7
@@
#include <asm/e820.h>
#include <asm/setup.h>
#include <asm/e820.h>
#include <asm/setup.h>
-/*
- * Any quirks to be performed to initialize timers/irqs/etc?
- */
-int (*arch_time_init_quirk)(void);
-int (*arch_pre_intr_init_quirk)(void);
-int (*arch_intr_init_quirk)(void);
-int (*arch_trap_init_quirk)(void);
+#include <mach_ipi.h>
#ifdef CONFIG_HOTPLUG_CPU
#define DEFAULT_SEND_IPI (1)
#ifdef CONFIG_HOTPLUG_CPU
#define DEFAULT_SEND_IPI (1)
@@
-24,7
+18,7
@@
int (*arch_trap_init_quirk)(void);
#define DEFAULT_SEND_IPI (0)
#endif
#define DEFAULT_SEND_IPI (0)
#endif
-int no_broadcast
=
DEFAULT_SEND_IPI;
+int no_broadcast
=
DEFAULT_SEND_IPI;
/**
* pre_intr_init_hook - initialisation prior to setting up interrupt vectors
/**
* pre_intr_init_hook - initialisation prior to setting up interrupt vectors
@@
-37,22
+31,13
@@
int no_broadcast=DEFAULT_SEND_IPI;
**/
void __init pre_intr_init_hook(void)
{
**/
void __init pre_intr_init_hook(void)
{
- if (
arch_pre_intr_init_quirk
) {
- if (
arch_pre_intr_init_quirk
())
+ if (
x86_quirks->arch_pre_intr_init
) {
+ if (
x86_quirks->arch_pre_intr_init
())
return;
}
init_ISA_irqs();
}
return;
}
init_ISA_irqs();
}
-/*
- * IRQ2 is cascade interrupt to second interrupt controller
- */
-static struct irqaction irq2 = {
- .handler = no_action,
- .mask = CPU_MASK_NONE,
- .name = "cascade",
-};
-
/**
* intr_init_hook - post gate setup interrupt initialisation
*
/**
* intr_init_hook - post gate setup interrupt initialisation
*
@@
-64,16
+49,10
@@
static struct irqaction irq2 = {
**/
void __init intr_init_hook(void)
{
**/
void __init intr_init_hook(void)
{
- if (
arch_intr_init_quirk
) {
- if (
arch_intr_init_quirk
())
+ if (
x86_quirks->arch_intr_init
) {
+ if (
x86_quirks->arch_intr_init
())
return;
}
return;
}
-#ifdef CONFIG_X86_LOCAL_APIC
- apic_intr_init();
-#endif
-
- if (!acpi_ioapic)
- setup_irq(2, &irq2);
}
/**
}
/**
@@
-97,8
+76,8
@@
void __init pre_setup_arch_hook(void)
**/
void __init trap_init_hook(void)
{
**/
void __init trap_init_hook(void)
{
- if (
arch_trap_init_quirk
) {
- if (
arch_trap_init_quirk
())
+ if (
x86_quirks->arch_trap_init
) {
+ if (
x86_quirks->arch_trap_init
())
return;
}
}
return;
}
}
@@
-110,6
+89,16
@@
static struct irqaction irq0 = {
.name = "timer"
};
.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.
*
/**
* time_init_hook - do any specific initialisations for the system timer.
*
@@
-119,13
+108,13
@@
static struct irqaction irq0 = {
**/
void __init time_init_hook(void)
{
**/
void __init time_init_hook(void)
{
- if (
arch_time_init_quirk
) {
+ 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:
*/
/*
* 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 (
arch_time_init_quirk
())
+ if (
x86_quirks->arch_time_init
())
return;
}
return;
}
This page took
0.027538 seconds
and
5
git commands to generate.