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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
gt64260_pic.c
diff --git
a/arch/ppc/syslib/gt64260_pic.c
b/arch/ppc/syslib/gt64260_pic.c
index
dc3bd9e
..
7fd550a
100644
(file)
--- a/
arch/ppc/syslib/gt64260_pic.c
+++ b/
arch/ppc/syslib/gt64260_pic.c
@@
-98,7
+98,7
@@
gt64260_init_irq(void)
/* use the gt64260 for all (possible) interrupt sources */
for (i = gt64260_irq_base; i < (gt64260_irq_base + 96); i++)
/* use the gt64260 for all (possible) interrupt sources */
for (i = gt64260_irq_base; i < (gt64260_irq_base + 96); i++)
- irq_desc[i].
handler
= >64260_pic;
+ irq_desc[i].
chip
= >64260_pic;
if (ppc_md.progress)
ppc_md.progress("gt64260_init_irq: exit", 0x0);
if (ppc_md.progress)
ppc_md.progress("gt64260_init_irq: exit", 0x0);
@@
-297,7
+297,7
@@
gt64260_register_hdlrs(void)
/* Register CPU interface error interrupt handler */
if ((rc = request_irq(MV64x60_IRQ_CPU_ERR,
/* Register CPU interface error interrupt handler */
if ((rc = request_irq(MV64x60_IRQ_CPU_ERR,
- gt64260_cpu_error_int_handler,
SA_INTERRUPT
, CPU_INTR_STR, 0)))
+ gt64260_cpu_error_int_handler,
IRQF_DISABLED
, CPU_INTR_STR, 0)))
printk(KERN_WARNING "Can't register cpu error handler: %d", rc);
mv64x60_write(&bh, MV64x60_CPU_ERR_MASK, 0);
printk(KERN_WARNING "Can't register cpu error handler: %d", rc);
mv64x60_write(&bh, MV64x60_CPU_ERR_MASK, 0);
@@
-305,7
+305,7
@@
gt64260_register_hdlrs(void)
/* Register PCI 0 error interrupt handler */
if ((rc = request_irq(MV64360_IRQ_PCI0, gt64260_pci_error_int_handler,
/* Register PCI 0 error interrupt handler */
if ((rc = request_irq(MV64360_IRQ_PCI0, gt64260_pci_error_int_handler,
-
SA_INTERRUPT
, PCI0_INTR_STR, (void *)0)))
+
IRQF_DISABLED
, PCI0_INTR_STR, (void *)0)))
printk(KERN_WARNING "Can't register pci 0 error handler: %d",
rc);
printk(KERN_WARNING "Can't register pci 0 error handler: %d",
rc);
@@
-314,7
+314,7
@@
gt64260_register_hdlrs(void)
/* Register PCI 1 error interrupt handler */
if ((rc = request_irq(MV64360_IRQ_PCI1, gt64260_pci_error_int_handler,
/* Register PCI 1 error interrupt handler */
if ((rc = request_irq(MV64360_IRQ_PCI1, gt64260_pci_error_int_handler,
-
SA_INTERRUPT
, PCI1_INTR_STR, (void *)1)))
+
IRQF_DISABLED
, PCI1_INTR_STR, (void *)1)))
printk(KERN_WARNING "Can't register pci 1 error handler: %d",
rc);
printk(KERN_WARNING "Can't register pci 1 error handler: %d",
rc);