diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2016-11-21 10:56:25 -0800 |
---|---|---|
committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-11-21 10:56:25 -0800 |
commit | 84dc474f3c33c4fbbe42f46876e0dde502e60ad0 (patch) | |
tree | 1c60e8369668a67042e47774ae4a389bbfc239b6 /arch/sparc/mm/tlb.c | |
parent | 40ceb2c69964f8bde97d4ded4306508db16fd365 (diff) | |
parent | 4eb9a81002485a7abfa53a334dde5bc10328079f (diff) |
Merge tag 'v4.4.34' into android-4.4.y
This is the 4.4.34 stable release
Change-Id: Ic90323945584a7173f54595e0482d26fafd10174
Diffstat (limited to 'arch/sparc/mm/tlb.c')
-rw-r--r-- | arch/sparc/mm/tlb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/mm/tlb.c b/arch/sparc/mm/tlb.c index f81cd9736700..3659d37b4d81 100644 --- a/arch/sparc/mm/tlb.c +++ b/arch/sparc/mm/tlb.c @@ -175,9 +175,9 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr, if ((pmd_val(pmd) ^ pmd_val(orig)) & _PAGE_PMD_HUGE) { if (pmd_val(pmd) & _PAGE_PMD_HUGE) - mm->context.huge_pte_count++; + mm->context.thp_pte_count++; else - mm->context.huge_pte_count--; + mm->context.thp_pte_count--; /* Do not try to allocate the TSB hash table if we * don't have one already. We have various locks held |