projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] x86-64: Let oprofile reserve MSR on all CPUs
[powerpc.git]
/
arch
/
i386
/
kernel
/
i8259.c
diff --git
a/arch/i386/kernel/i8259.c
b/arch/i386/kernel/i8259.c
index
62996cd
..
03abfdb
100644
(file)
--- a/
arch/i386/kernel/i8259.c
+++ b/
arch/i386/kernel/i8259.c
@@
-41,6
+41,7
@@
static void mask_and_ack_8259A(unsigned int);
static struct irq_chip i8259A_chip = {
.name = "XT-PIC",
.mask = disable_8259A_irq,
static struct irq_chip i8259A_chip = {
.name = "XT-PIC",
.mask = disable_8259A_irq,
+ .disable = disable_8259A_irq,
.unmask = enable_8259A_irq,
.mask_ack = mask_and_ack_8259A,
};
.unmask = enable_8259A_irq,
.mask_ack = mask_and_ack_8259A,
};
@@
-381,7
+382,10
@@
void __init init_ISA_irqs (void)
}
}
}
}
-void __init init_IRQ(void)
+/* Overridden in paravirt.c */
+void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ")));
+
+void __init native_init_IRQ(void)
{
int i;
{
int i;
@@
-406,12
+410,6
@@
void __init init_IRQ(void)
*/
intr_init_hook();
*/
intr_init_hook();
- /*
- * Set the clock to HZ Hz, we already have a valid
- * vector now:
- */
- setup_pit_timer();
-
/*
* External FPU? Set up irq13 if so, for
* original braindamaged IBM FERR coupling.
/*
* External FPU? Set up irq13 if so, for
* original braindamaged IBM FERR coupling.