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

Merge tag 'for-linus-4.8b-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen regression fix from David Vrabel:
 "Fix SMP boot in arm guests"

* tag 'for-linus-4.8b-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  arm/xen: fix SMP guests boot
parents 5924bbec de75abbe

arch/arm/xen/enlighten.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -170,9 +170,6 @@ static int xen_starting_cpu(unsigned int cpu) 
	pr_info("Xen: initializing cpu%d\n", cpu);

	pr_info("Xen: initializing cpu%d\n", cpu);

	vcpup = per_cpu_ptr(xen_vcpu_info, cpu);

	vcpup = per_cpu_ptr(xen_vcpu_info, cpu);





	/* Direct vCPU id mapping for ARM guests. */

	per_cpu(xen_vcpu_id, cpu) = cpu;



	info.mfn = virt_to_gfn(vcpup);

	info.mfn = virt_to_gfn(vcpup);

	info.offset = xen_offset_in_page(vcpup);

	info.offset = xen_offset_in_page(vcpup);
@@ -330,6 +327,7 @@ static int __init xen_guest_init(void) 
{

{

	struct xen_add_to_physmap xatp;

	struct xen_add_to_physmap xatp;

	struct shared_info *shared_info_page = NULL;

	struct shared_info *shared_info_page = NULL;

	int cpu;





	if (!xen_domain())

	if (!xen_domain())

		return 0;

		return 0;
@@ -380,7 +378,8 @@ static int __init xen_guest_init(void) 
		return -ENOMEM;

		return -ENOMEM;





	/* Direct vCPU id mapping for ARM guests. */

	/* Direct vCPU id mapping for ARM guests. */

	per_cpu(xen_vcpu_id, 0) = 0;

	for_each_possible_cpu(cpu)

		per_cpu(xen_vcpu_id, cpu) = cpu;





	xen_auto_xlat_grant_frames.count = gnttab_max_grant_frames();

	xen_auto_xlat_grant_frames.count = gnttab_max_grant_frames();

	if (xen_xlate_map_ballooned_pages(&xen_auto_xlat_grant_frames.pfn,

	if (xen_xlate_map_ballooned_pages(&xen_auto_xlat_grant_frames.pfn,