diff options
Diffstat (limited to 'arch/mips/jazz')
-rw-r--r-- | arch/mips/jazz/Makefile | 2 | ||||
-rw-r--r-- | arch/mips/jazz/irq.c | 2 | ||||
-rw-r--r-- | arch/mips/jazz/jazzdma.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/arch/mips/jazz/Makefile b/arch/mips/jazz/Makefile index 02bd39add891..dd9d99bfcf7a 100644 --- a/arch/mips/jazz/Makefile +++ b/arch/mips/jazz/Makefile | |||
@@ -3,5 +3,3 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := irq.o jazzdma.o reset.o setup.o | 5 | obj-y := irq.o jazzdma.o reset.o setup.o |
6 | |||
7 | EXTRA_AFLAGS := $(CFLAGS) | ||
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c index 295892e4ce53..015cf4bb51dd 100644 --- a/arch/mips/jazz/irq.c +++ b/arch/mips/jazz/irq.c | |||
@@ -122,7 +122,7 @@ static void ll_local_dev(void) | |||
122 | 122 | ||
123 | asmlinkage void plat_irq_dispatch(void) | 123 | asmlinkage void plat_irq_dispatch(void) |
124 | { | 124 | { |
125 | unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM; | 125 | unsigned int pending = read_c0_cause() & read_c0_status(); |
126 | 126 | ||
127 | if (pending & IE_IRQ5) | 127 | if (pending & IE_IRQ5) |
128 | write_c0_compare(0); | 128 | write_c0_compare(0); |
diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c index 46e421e14348..e8e0ffb9354d 100644 --- a/arch/mips/jazz/jazzdma.c +++ b/arch/mips/jazz/jazzdma.c | |||
@@ -67,7 +67,8 @@ void __init vdma_init(void) | |||
67 | * aligned and should be uncached to avoid cache flushing after every | 67 | * aligned and should be uncached to avoid cache flushing after every |
68 | * update. | 68 | * update. |
69 | */ | 69 | */ |
70 | vdma_pagetable_start = alloc_bootmem_low_pages(VDMA_PGTBL_SIZE); | 70 | vdma_pagetable_start = |
71 | (unsigned long) alloc_bootmem_low_pages(VDMA_PGTBL_SIZE); | ||
71 | if (!vdma_pagetable_start) | 72 | if (!vdma_pagetable_start) |
72 | BUG(); | 73 | BUG(); |
73 | dma_cache_wback_inv(vdma_pagetable_start, VDMA_PGTBL_SIZE); | 74 | dma_cache_wback_inv(vdma_pagetable_start, VDMA_PGTBL_SIZE); |