patch-2.4.21 linux-2.4.21/arch/ppc/platforms/pmac_pic.c
Next file: linux-2.4.21/arch/ppc/platforms/pmac_pic.h
Previous file: linux-2.4.21/arch/ppc/platforms/pmac_pci.c
Back to the patch index
Back to the overall index
- Lines: 47
- Date:
2003-06-13 07:51:31.000000000 -0700
- Orig file:
linux-2.4.20/arch/ppc/platforms/pmac_pic.c
- Orig date:
2002-11-28 15:53:11.000000000 -0800
diff -urN linux-2.4.20/arch/ppc/platforms/pmac_pic.c linux-2.4.21/arch/ppc/platforms/pmac_pic.c
@@ -1,6 +1,3 @@
-/*
- * BK Id: SCCS/s.pmac_pic.c 1.24 12/19/01 10:53:01 paulus
- */
#include <linux/config.h>
#include <linux/stddef.h>
#include <linux/init.h>
@@ -358,26 +355,28 @@
printk("PowerMac using OpenPIC irq controller\n");
if (irqctrler->n_addrs > 0)
{
- int nmi_irq = -1;
unsigned char senses[NR_IRQS];
-#ifdef CONFIG_XMON
- struct device_node* pswitch;
- pswitch = find_devices("programmer-switch");
- if (pswitch && pswitch->n_intrs)
- nmi_irq = pswitch->intrs[0].line;
-#endif /* CONFIG_XMON */
prom_get_irq_senses(senses, 0, NR_IRQS);
OpenPIC_InitSenses = senses;
OpenPIC_NumInitSenses = NR_IRQS;
ppc_md.get_irq = openpic_get_irq;
OpenPIC_Addr = ioremap(irqctrler->addrs[0].address,
irqctrler->addrs[0].size);
- openpic_init(1, 0, 0, nmi_irq);
+ openpic_init(0);
#ifdef CONFIG_XMON
- if (nmi_irq >= 0)
- request_irq(nmi_irq, xmon_irq, 0,
- "NMI - XMON", 0);
+ {
+ struct device_node* pswitch;
+ int nmi_irq;
+
+ pswitch = find_devices("programmer-switch");
+ if (pswitch && pswitch->n_intrs) {
+ nmi_irq = pswitch->intrs[0].line;
+ openpic_init_nmi_irq(nmi_irq);
+ request_irq(nmi_irq, xmon_irq, 0,
+ "NMI - XMON", 0);
+ }
+ }
#endif /* CONFIG_XMON */
return;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)