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

Merge tag 'for-linus-7.0-rc1a-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fix from Juergen Gross:
 "A single patch fixing a boot regression when running as a Xen PV
  guest. This issue was introduced in this merge window"

* tag 'for-linus-7.0-rc1a-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  x86/xen: Fix Xen PV guest boot
parents d31558c0 5043d7ed

arch/x86/xen/mmu_pv.c

+5 −1
Original line number Diff line number Diff line
@@ -509,6 +509,9 @@ static pgd_t *xen_get_user_pgd(pgd_t *pgd) 
	unsigned offset = pgd - pgd_page;

	pgd_t *user_ptr = NULL;



	if (!static_branch_likely(&xen_struct_pages_ready))

		return NULL;



	if (offset < pgd_index(USER_LIMIT)) {

		struct page *page = virt_to_page(pgd_page);

		user_ptr = (pgd_t *)page->private;
@@ -1098,6 +1101,7 @@ static void __init xen_cleanmfnmap_free_pgtbl(void *pgtbl, bool unpin) 


	if (unpin)

		pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, PFN_DOWN(pa));

	if (static_branch_likely(&xen_struct_pages_ready))

		ClearPagePinned(virt_to_page(__va(pa)));

	xen_free_ro_pages(pa, PAGE_SIZE);

}