From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 12 Sep 2012 15:22:24 +0000 (-0400)
Subject: Merge branch 'stable/for-linus-3.7' into linux-next
X-Git-Tag: next-20120913~33^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3153e9a8aa96bd1f11988c7c70d9372f00b615a1;p=karo-tx-linux.git

Merge branch 'stable/for-linus-3.7' into linux-next

* stable/for-linus-3.7:
  x86: Document x86_init.paging.pagetable_init()
  x86: xen: Cleanup and remove x86_init.paging.pagetable_setup_done()
  x86: Move paging_init() call to x86_init.paging.pagetable_init()
  x86: Rename pagetable_setup_start() to pagetable_init()
  x86: Remove base argument from x86_init.paging.pagetable_setup_start
  xen/mmu: If the revector fails, don't attempt to revector anything else.
  xen/p2m: When revectoring deal with holes in the P2M array.
  xen/mmu: Release just the MFN list, not MFN list and part of pagetables.
  xen/mmu: Remove from __ka space PMD entries for pagetables.
  xen/mmu: Copy and revector the P2M tree.
  xen/p2m: Add logic to revector a P2M tree to use __va leafs.
  xen/mmu: Recycle the Xen provided L4, L3, and L2 pages
  xen/mmu: For 64-bit do not call xen_map_identity_early
  xen/mmu: use copy_page instead of memcpy.
  xen/mmu: Provide comments describing the _ka and _va aliasing issue
  xen/mmu: The xen_setup_kernel_pagetable doesn't need to return anything.
  Revert "xen/x86: Workaround 64-bit hypervisor and 32-bit initial domain." and "xen/x86: Use memblock_reserve for sensitive areas."
  xen/x86: Workaround 64-bit hypervisor and 32-bit initial domain.
  xen/x86: Use memblock_reserve for sensitive areas.
  xen/p2m: Fix the comment describing the P2M tree.
---

3153e9a8aa96bd1f11988c7c70d9372f00b615a1