diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
| commit | 399f486286f44d55c4fff0e9cc5d712f2b443489 (patch) | |
| tree | 0c2820b3e04232eaa96f08c1057b87728fb3e7a4 /arch/sparc64/mm/tlb.c | |
| parent | 481419ec9fbdf3f4ec5389c7e91a81b4a7ebee8d (diff) | |
| parent | a9edadbf790d72adf6ebed476cb5caf7743e7e4a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/sparc64/mm/tlb.c')
| -rw-r--r-- | arch/sparc64/mm/tlb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc64/mm/tlb.c b/arch/sparc64/mm/tlb.c index 3f10fc921b00..a0f000b293de 100644 --- a/arch/sparc64/mm/tlb.c +++ b/arch/sparc64/mm/tlb.c | |||
| @@ -23,10 +23,11 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers) = { 0, }; | |||
| 23 | 23 | ||
| 24 | void flush_tlb_pending(void) | 24 | void flush_tlb_pending(void) |
| 25 | { | 25 | { |
| 26 | struct mmu_gather *mp = &__get_cpu_var(mmu_gathers); | 26 | struct mmu_gather *mp; |
| 27 | 27 | ||
| 28 | preempt_disable(); | 28 | preempt_disable(); |
| 29 | 29 | ||
| 30 | mp = &__get_cpu_var(mmu_gathers); | ||
| 30 | if (mp->tlb_nr) { | 31 | if (mp->tlb_nr) { |
| 31 | flush_tsb_user(mp); | 32 | flush_tsb_user(mp); |
| 32 | 33 | ||