]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'stable/for-linus-3.7.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 31 Jul 2012 18:44:59 +0000 (14:44 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 31 Jul 2012 18:44:59 +0000 (14:44 -0400)
commit92c32bf7a7b7b59238ea45628426eeaa279213da
tree8de8fd6affaf9f5f71a1793ad63ef71b1b26ef42
parent2d2a4299341846087f8b558e505a5e9db0608ce8
parent4443856dbcb52065658f287cbf6dd17bc5d527d0
Merge branch 'stable/for-linus-3.7.rebased' into uek2-merge

* stable/for-linus-3.7.rebased:
  xen/p2m: Reserve 8MB of _brk space for P2M leafs when populating back.
  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.
  xen/x86: Use memblock_reserve for sensitive areas.
  xen/p2m: Fix the comment describing the P2M tree.
  xen/perf: Define .glob for the different hypercalls.
arch/x86/xen/enlighten.c
arch/x86/xen/setup.c
arch/x86/xen/xen-ops.h