git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sh: Correct the PTRS_PER_PMD and PMD_SHIFT values
[safe/jmp/linux-2.6]
/
arch
/
arm
/
mach-netx
/
generic.c
diff --git
a/arch/arm/mach-netx/generic.c
b/arch/arm/mach-netx/generic.c
index
798ac6e
..
43da8bb
100644
(file)
--- a/
arch/arm/mach-netx/generic.c
+++ b/
arch/arm/mach-netx/generic.c
@@
-22,11
+22,11
@@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <asm/arch/hardware.h>
+#include <linux/io.h>
+#include <mach/hardware.h>
#include <asm/mach/map.h>
#include <asm/hardware/vic.h>
#include <asm/mach/map.h>
#include <asm/hardware/vic.h>
-#include <asm/io.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
#include <asm/mach/irq.h>
static struct map_desc netx_io_desc[] __initdata = {
#include <asm/mach/irq.h>
static struct map_desc netx_io_desc[] __initdata = {
@@
-77,15
+77,12
@@
netx_hif_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
stat = ((readl(NETX_DPMAS_INT_EN) &
readl(NETX_DPMAS_INT_STAT)) >> 24) & 0x1f;
stat = ((readl(NETX_DPMAS_INT_EN) &
readl(NETX_DPMAS_INT_STAT)) >> 24) & 0x1f;
- desc = irq_desc + NETX_IRQ_HIF_CHAINED(0);
-
while (stat) {
if (stat & 1) {
DEBUG_IRQ("handling irq %d\n", irq);
while (stat) {
if (stat & 1) {
DEBUG_IRQ("handling irq %d\n", irq);
-
desc_handle_irq(irq, desc
);
+
generic_handle_irq(irq
);
}
irq++;
}
irq++;
- desc++;
stat >>= 1;
}
}
stat >>= 1;
}
}
@@
-171,7
+168,7
@@
void __init netx_init_irq(void)
{
int irq;
{
int irq;
- vic_init(__io(io_p2v(NETX_PA_VIC)), 0, ~0);
+ vic_init(__io(io_p2v(NETX_PA_VIC)), 0, ~0
, 0
);
for (irq = NETX_IRQ_HIF_CHAINED(0); irq <= NETX_IRQ_HIF_LAST; irq++) {
set_irq_chip(irq, &netx_hif_chip);
for (irq = NETX_IRQ_HIF_CHAINED(0); irq <= NETX_IRQ_HIF_LAST; irq++) {
set_irq_chip(irq, &netx_hif_chip);