diff options
author | David S. Miller <davem@davemloft.net> | 2017-02-19 11:18:46 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-19 11:18:46 -0500 |
commit | f787d1debf63f78a15b2d1c79e7f1788c4fadfa0 (patch) | |
tree | 97811cde0b0b3f3f32af3eb48516d539d60573f5 /arch/x86 | |
parent | 4e33e34625103593a71d2bae471ce49cef62ef06 (diff) | |
parent | 00ea1ceebe0d9f2dc1cc2b7bd575a00100c27869 (diff) | |
download | linux-f787d1debf63f78a15b2d1c79e7f1788c4fadfa0.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/vm86_32.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c index ec5d7545e6dc..0442d98367ae 100644 --- a/arch/x86/kernel/vm86_32.c +++ b/arch/x86/kernel/vm86_32.c @@ -160,11 +160,12 @@ void save_v86_state(struct kernel_vm86_regs *regs, int retval) static void mark_screen_rdonly(struct mm_struct *mm) { + struct vm_area_struct *vma; + spinlock_t *ptl; pgd_t *pgd; pud_t *pud; pmd_t *pmd; pte_t *pte; - spinlock_t *ptl; int i; down_write(&mm->mmap_sem); @@ -177,7 +178,7 @@ static void mark_screen_rdonly(struct mm_struct *mm) pmd = pmd_offset(pud, 0xA0000); if (pmd_trans_huge(*pmd)) { - struct vm_area_struct *vma = find_vma(mm, 0xA0000); + vma = find_vma(mm, 0xA0000); split_huge_pmd(vma, pmd, 0xA0000); } if (pmd_none_or_clear_bad(pmd)) |