]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'stable/mmu.fixes' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Sat, 24 Sep 2011 02:33:49 +0000 (22:33 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Sat, 24 Sep 2011 02:33:49 +0000 (22:33 -0400)
* stable/mmu.fixes:
  xen/p2m: Use SetPagePrivate and its friends for M2P overrides.
  xen/p2m: Make debug/xen/mmu/p2m visible again.
  Revert "xen/debug: WARN_ON when identity PFN has no _PAGE_IOMAP flag set."

1  2 
arch/x86/include/asm/xen/page.h
arch/x86/xen/mmu.c

Simple merge
Simple merge