diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-20 16:32:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-20 16:32:19 -0700 |
| commit | a9523f45264aee8ec8d9f82091a0dfe1418fb2f8 (patch) | |
| tree | 43be11fc480090c1f3698c02302ea88ca1f4ea51 /arch/mips/mm/tlb-r8k.c | |
| parent | 9fe02c03b4e892acb3c33819ac4385d43b2f0bd7 (diff) | |
| parent | a5e696e5d0f1377ff6beb10d2f40edb6a3d1de18 (diff) | |
| download | op-kernel-dev-a9523f45264aee8ec8d9f82091a0dfe1418fb2f8.zip op-kernel-dev-a9523f45264aee8ec8d9f82091a0dfe1418fb2f8.tar.gz | |
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-r8k.c')
| -rw-r--r-- | arch/mips/mm/tlb-r8k.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/mm/tlb-r8k.c b/arch/mips/mm/tlb-r8k.c index 4f01a3b..4ec95cc 100644 --- a/arch/mips/mm/tlb-r8k.c +++ b/arch/mips/mm/tlb-r8k.c @@ -111,8 +111,7 @@ out_restore: /* Usable for KV1 addresses only! */ void local_flush_tlb_kernel_range(unsigned long start, unsigned long end) { - unsigned long flags; - int size; + unsigned long size, flags; size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; size = (size + 1) >> 1; |
