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.5.x5
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
xilinx_pic.c
diff --git
a/arch/ppc/syslib/xilinx_pic.c
b/arch/ppc/syslib/xilinx_pic.c
index
89b5ac1
..
483d06d
100644
(file)
--- a/
arch/ppc/syslib/xilinx_pic.c
+++ b/
arch/ppc/syslib/xilinx_pic.c
@@
-38,9
+38,6
@@
static volatile u32 *intc;
#define intc_in_be32(addr) mfdcr((addr))
#endif
#define intc_in_be32(addr) mfdcr((addr))
#endif
-/* Global Variables */
-struct hw_interrupt_type *ppc4xx_pic;
-
static void
xilinx_intc_enable(unsigned int irq)
{
static void
xilinx_intc_enable(unsigned int irq)
{
@@
-115,6
+112,8
@@
xilinx_pic_get_irq(struct pt_regs *regs)
void __init
ppc4xx_pic_init(void)
{
void __init
ppc4xx_pic_init(void)
{
+ int i;
+
#if XPAR_XINTC_USE_DCR == 0
intc = ioremap(XPAR_INTC_0_BASEADDR, 32);
#if XPAR_XINTC_USE_DCR == 0
intc = ioremap(XPAR_INTC_0_BASEADDR, 32);
@@
-137,6
+136,8
@@
ppc4xx_pic_init(void)
/* Turn on the Master Enable. */
intc_out_be32(intc + MER, 0x3UL);
/* Turn on the Master Enable. */
intc_out_be32(intc + MER, 0x3UL);
- ppc4xx_pic = &xilinx_intc;
ppc_md.get_irq = xilinx_pic_get_irq;
ppc_md.get_irq = xilinx_pic_get_irq;
+
+ for (i = 0; i < NR_IRQS; ++i)
+ irq_desc[i].handler = &xilinx_intc;
}
}