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

Commit cb110171 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, xen: fix use of pgd_page now that it really does return a page
parents 55477eb4 47cb2ed9

arch/x86/xen/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ static void __xen_pgd_pin(struct mm_struct *mm, pgd_t *pgd) 
#else /* CONFIG_X86_32 */

#ifdef CONFIG_X86_PAE

	/* Need to make sure unshared kernel PMD is pinnable */

	xen_pin_page(mm, virt_to_page(pgd_page(pgd[pgd_index(TASK_SIZE)])),

	xen_pin_page(mm, pgd_page(pgd[pgd_index(TASK_SIZE)]),

		     PT_PMD);

#endif

	xen_do_pin(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(pgd)));
@@ -994,7 +994,7 @@ static void __xen_pgd_unpin(struct mm_struct *mm, pgd_t *pgd) 


#ifdef CONFIG_X86_PAE

	/* Need to make sure unshared kernel PMD is unpinned */

	xen_unpin_page(mm, virt_to_page(pgd_page(pgd[pgd_index(TASK_SIZE)])),

	xen_unpin_page(mm, pgd_page(pgd[pgd_index(TASK_SIZE)]),

		       PT_PMD);

#endif