Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+5
-1
+5
-1
arch/x86/xen/mmu_pv.c
+5
-1
arch/x86/xen/mmu_pv.c
···
509
509
unsigned offset = pgd - pgd_page;
510
510
pgd_t *user_ptr = NULL;
511
511
512
+
if (!static_branch_likely(&xen_struct_pages_ready))
513
+
return NULL;
514
+
512
515
if (offset < pgd_index(USER_LIMIT)) {
513
516
struct page *page = virt_to_page(pgd_page);
514
517
user_ptr = (pgd_t *)page->private;
···
1101
1098
1102
1099
if (unpin)
1103
1100
pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, PFN_DOWN(pa));
1104
-
ClearPagePinned(virt_to_page(__va(pa)));
1101
+
if (static_branch_likely(&xen_struct_pages_ready))
1102
+
ClearPagePinned(virt_to_page(__va(pa)));
1105
1103
xen_free_ro_pages(pa, PAGE_SIZE);
1106
1104
}
1107
1105