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
/
ipic.c
diff --git
a/arch/ppc/syslib/ipic.c
b/arch/ppc/syslib/ipic.c
index
580ed65
..
46801f5
100644
(file)
--- a/
arch/ppc/syslib/ipic.c
+++ b/
arch/ppc/syslib/ipic.c
@@
-79,7
+79,7
@@
static struct ipic_info ipic_info[] = {
.prio_mask = 7,
},
[17] = {
.prio_mask = 7,
},
[17] = {
- .pend = IPIC_S
IPNR_H
,
+ .pend = IPIC_S
EPNR
,
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_A,
.force = IPIC_SEFCR,
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_A,
.force = IPIC_SEFCR,
@@
-87,7
+87,7
@@
static struct ipic_info ipic_info[] = {
.prio_mask = 5,
},
[18] = {
.prio_mask = 5,
},
[18] = {
- .pend = IPIC_S
IPNR_H
,
+ .pend = IPIC_S
EPNR
,
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_A,
.force = IPIC_SEFCR,
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_A,
.force = IPIC_SEFCR,
@@
-95,7
+95,7
@@
static struct ipic_info ipic_info[] = {
.prio_mask = 6,
},
[19] = {
.prio_mask = 6,
},
[19] = {
- .pend = IPIC_S
IPNR_H
,
+ .pend = IPIC_S
EPNR
,
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_A,
.force = IPIC_SEFCR,
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_A,
.force = IPIC_SEFCR,
@@
-103,7
+103,7
@@
static struct ipic_info ipic_info[] = {
.prio_mask = 7,
},
[20] = {
.prio_mask = 7,
},
[20] = {
- .pend = IPIC_S
IPNR_H
,
+ .pend = IPIC_S
EPNR
,
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_B,
.force = IPIC_SEFCR,
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_B,
.force = IPIC_SEFCR,
@@
-111,7
+111,7
@@
static struct ipic_info ipic_info[] = {
.prio_mask = 4,
},
[21] = {
.prio_mask = 4,
},
[21] = {
- .pend = IPIC_S
IPNR_H
,
+ .pend = IPIC_S
EPNR
,
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_B,
.force = IPIC_SEFCR,
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_B,
.force = IPIC_SEFCR,
@@
-119,7
+119,7
@@
static struct ipic_info ipic_info[] = {
.prio_mask = 5,
},
[22] = {
.prio_mask = 5,
},
[22] = {
- .pend = IPIC_S
IPNR_H
,
+ .pend = IPIC_S
EPNR
,
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_B,
.force = IPIC_SEFCR,
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_B,
.force = IPIC_SEFCR,
@@
-127,7
+127,7
@@
static struct ipic_info ipic_info[] = {
.prio_mask = 6,
},
[23] = {
.prio_mask = 6,
},
[23] = {
- .pend = IPIC_S
IPNR_H
,
+ .pend = IPIC_S
EPNR
,
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_B,
.force = IPIC_SEFCR,
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_B,
.force = IPIC_SEFCR,
@@
-472,7
+472,7
@@
void __init ipic_init(phys_addr_t phys_addr,
ipic_write(primary_ipic->regs, IPIC_SEMSR, temp);
for (i = 0 ; i < NR_IPIC_INTS ; i++) {
ipic_write(primary_ipic->regs, IPIC_SEMSR, temp);
for (i = 0 ; i < NR_IPIC_INTS ; i++) {
- irq_desc[i+irq_offset].
handler
= &ipic;
+ irq_desc[i+irq_offset].
chip
= &ipic;
irq_desc[i+irq_offset].status = IRQ_LEVEL;
}
irq_desc[i+irq_offset].status = IRQ_LEVEL;
}