git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
i8259.c
diff --git
a/arch/i386/kernel/i8259.c
b/arch/i386/kernel/i8259.c
index
0be8d6b
..
97653d2
100644
(file)
--- a/
arch/i386/kernel/i8259.c
+++ b/
arch/i386/kernel/i8259.c
@@
-317,19
+317,14
@@
void init_8259A(int auto_eoi)
* be shot.
*/
* be shot.
*/
-/*
- * =PC9800NOTE= In NEC PC-9800, we use irq8 instead of irq13!
- */
static irqreturn_t math_error_irq(int cpl, void *dev_id, struct pt_regs *regs)
{
static irqreturn_t math_error_irq(int cpl, void *dev_id, struct pt_regs *regs)
{
- extern void math_error(void *);
-#ifndef CONFIG_X86_PC9800
+ extern void math_error(void __user *);
outb(0,0xF0);
outb(0,0xF0);
-#endif
if (ignore_fpu_irq || !boot_cpu_data.hard_math)
return IRQ_NONE;
if (ignore_fpu_irq || !boot_cpu_data.hard_math)
return IRQ_NONE;
- math_error((void *)regs->eip);
+ math_error((void
__user
*)regs->eip);
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
@@
-337,7
+332,7
@@
static irqreturn_t math_error_irq(int cpl, void *dev_id, struct pt_regs *regs)
* New motherboards sometimes make IRQ 13 be a PCI interrupt,
* so allow interrupt sharing.
*/
* New motherboards sometimes make IRQ 13 be a PCI interrupt,
* so allow interrupt sharing.
*/
-static struct irqaction fpu_irq = { math_error_irq, 0,
0
, "fpu", NULL, NULL };
+static struct irqaction fpu_irq = { math_error_irq, 0,
CPU_MASK_NONE
, "fpu", NULL, NULL };
void __init init_ISA_irqs (void)
{
void __init init_ISA_irqs (void)
{
@@
-350,7
+345,7
@@
void __init init_ISA_irqs (void)
for (i = 0; i < NR_IRQS; i++) {
irq_desc[i].status = IRQ_DISABLED;
for (i = 0; i < NR_IRQS; i++) {
irq_desc[i].status = IRQ_DISABLED;
- irq_desc[i].action =
0
;
+ irq_desc[i].action =
NULL
;
irq_desc[i].depth = 1;
if (i < 16) {
irq_desc[i].depth = 1;
if (i < 16) {