diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-21 01:32:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-21 01:32:19 +0200 |
| commit | a9523f45264aee8ec8d9f82091a0dfe1418fb2f8 (patch) | |
| tree | 43be11fc480090c1f3698c02302ea88ca1f4ea51 /arch/mips/mm/tlb-r3k.c | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | MIPS: 64-bit: Fix system lockup. (diff) | |
| download | linux-a9523f45264aee8ec8d9f82091a0dfe1418fb2f8.tar.xz linux-a9523f45264aee8ec8d9f82091a0dfe1418fb2f8.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: 64-bit: Fix system lockup.
MIPS: IP28: Change to build with -mr10k-cache-barrier=store
MIPS: IP22: Fix hang in power button interrupt handler
MIPS: IP32: Fix hang on shutdown in power button interrupt handler.
Diffstat (limited to 'arch/mips/mm/tlb-r3k.c')
| -rw-r--r-- | arch/mips/mm/tlb-r3k.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/mips/mm/tlb-r3k.c b/arch/mips/mm/tlb-r3k.c index f0cf46adb978..1c0048a6f5cf 100644 --- a/arch/mips/mm/tlb-r3k.c +++ b/arch/mips/mm/tlb-r3k.c @@ -82,8 +82,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start, int cpu = smp_processor_id(); if (cpu_context(cpu, mm) != 0) { - unsigned long flags; - int size; + unsigned long size, flags; #ifdef DEBUG_TLB printk("[tlbrange<%lu,0x%08lx,0x%08lx>]", @@ -121,8 +120,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start, void local_flush_tlb_kernel_range(unsigned long start, unsigned long end) { - unsigned long flags; - int size; + unsigned long size, flags; #ifdef DEBUG_TLB printk("[tlbrange<%lu,0x%08lx,0x%08lx>]", start, end); |