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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
mach-integrator
/
integrator_ap.c
diff --git
a/arch/arm/mach-integrator/integrator_ap.c
b/arch/arm/mach-integrator/integrator_ap.c
index
d8d3c2a
..
7228075
100644
(file)
--- a/
arch/arm/mach-integrator/integrator_ap.c
+++ b/
arch/arm/mach-integrator/integrator_ap.c
@@
-161,7
+161,8
@@
static void sc_unmask_irq(unsigned int irq)
writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_SET);
}
writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_SET);
}
-static struct irqchip sc_chip = {
+static struct irq_chip sc_chip = {
+ .name = "SC",
.ack = sc_mask_irq,
.mask = sc_mask_irq,
.unmask = sc_unmask_irq,
.ack = sc_mask_irq,
.mask = sc_mask_irq,
.unmask = sc_unmask_irq,
@@
-182,7
+183,7
@@
static void __init ap_init_irq(void)
for (i = 0; i < NR_IRQS; i++) {
if (((1 << i) & INTEGRATOR_SC_VALID_INT) != 0) {
set_irq_chip(i, &sc_chip);
for (i = 0; i < NR_IRQS; i++) {
if (((1 << i) & INTEGRATOR_SC_VALID_INT) != 0) {
set_irq_chip(i, &sc_chip);
- set_irq_handler(i,
do_level_IRQ
);
+ set_irq_handler(i,
handle_level_irq
);
set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
}
}
set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
}
}
@@
-319,12
+320,10
@@
static void __init ap_init(void)
if ((sc_dec & (16 << i)) == 0)
continue;
if ((sc_dec & (16 << i)) == 0)
continue;
- lmdev = k
m
alloc(sizeof(struct lm_device), GFP_KERNEL);
+ lmdev = k
z
alloc(sizeof(struct lm_device), GFP_KERNEL);
if (!lmdev)
continue;
if (!lmdev)
continue;
- memset(lmdev, 0, sizeof(struct lm_device));
-
lmdev->resource.start = 0xc0000000 + 0x10000000 * i;
lmdev->resource.end = lmdev->resource.start + 0x0fffffff;
lmdev->resource.flags = IORESOURCE_MEM;
lmdev->resource.start = 0xc0000000 + 0x10000000 * i;
lmdev->resource.end = lmdev->resource.start + 0x0fffffff;
lmdev->resource.flags = IORESOURCE_MEM;