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

Commit 42ebfc61 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable/for-linus-fixes-3.2' of... 

Merge branch 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/swiotlb: Use page alignment for early buffer allocation.
  xen: only limit memory map to maximum reservation for domain 0.
parents 55b02d2f 63a74175

arch/x86/xen/setup.c

+15 −3
Original line number Diff line number Diff line
@@ -173,9 +173,21 @@ static unsigned long __init xen_get_max_pages(void) 
	domid_t domid = DOMID_SELF;

	int ret;



	/*

	 * For the initial domain we use the maximum reservation as

	 * the maximum page.

	 *

	 * For guest domains the current maximum reservation reflects

	 * the current maximum rather than the static maximum. In this

	 * case the e820 map provided to us will cover the static

	 * maximum region.

	 */

	if (xen_initial_domain()) {

		ret = HYPERVISOR_memory_op(XENMEM_maximum_reservation, &domid);

		if (ret > 0)

			max_pages = ret;

	}



	return min(max_pages, MAX_DOMAIN_PAGES);

}

drivers/xen/swiotlb-xen.c

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ retry: 
	/*

	 * Get IO TLB memory from any location.

	 */

	xen_io_tlb_start = alloc_bootmem(bytes);

	xen_io_tlb_start = alloc_bootmem_pages(PAGE_ALIGN(bytes));

	if (!xen_io_tlb_start) {

		m = "Cannot allocate Xen-SWIOTLB buffer!\n";

		goto error;
@@ -179,7 +179,7 @@ retry: 
			       bytes,

			       xen_io_tlb_nslabs);

	if (rc) {

		free_bootmem(__pa(xen_io_tlb_start), bytes);

		free_bootmem(__pa(xen_io_tlb_start), PAGE_ALIGN(bytes));

		m = "Failed to get contiguous memory for DMA from Xen!\n"\

		    "You either: don't have the permissions, do not have"\

		    " enough free memory under 4GB, or the hypervisor memory"\