tree 6544c050ac52e139e01025c1a992c15a26c95b57
parent f62805f1f30a40e354bd036b4cb799863a39be4b
parent 83d51ab473dddde7df858015070ed22b84ebe9a9
author Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 1336419207 -0400
committer Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 1336419207 -0400

Merge branch 'stable/autoballoon.v5.2' into stable/for-linus-3.5

* stable/autoballoon.v5.2:
  xen/setup: update VA mapping when releasing memory during setup
  xen/setup: Combine the two hypercall functions - since they are quite similar.
  xen/setup: Populate freed MFNs from non-RAM E820 entries and gaps to E820 RAM
  xen/setup: Only print "Freeing XXX-YYY pfn range: Z pages freed" if Z > 0
  xen/p2m: An early bootup variant of set_phys_to_machine
  xen/p2m: Collapse early_alloc_p2m_middle redundant checks.
  xen/p2m: Allow alloc_p2m_middle to call reserve_brk depending on argument
  xen/p2m: Move code around to allow for better re-usage.