Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17a984bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fix from Thomas Gleixner:
 "Make the build clean by working around yet another GCC stupidity"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vm86: Fix unused variable warning if THP is disabled
parents 244ff16f 3ba5b5ea

arch/x86/kernel/vm86_32.c

+3 −2
Original line number Diff line number Diff line
@@ -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))