From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 May 2011 02:01:15 +0000 (-0700)
Subject: Merge branch 'upstream/tidy-xen-mmu-2.6.39' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: firefly_0821_release~7613^2~1042
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dc7acbb2518f250050179c8581a972df3b6a24f1;p=firefly-linux-kernel-4.4.55.git

Merge branch 'upstream/tidy-xen-mmu-2.6.39' of git://git./linux/kernel/git/jeremy/xen

* 'upstream/tidy-xen-mmu-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen: fix compile without CONFIG_XEN_DEBUG_FS
  Use arbitrary_virt_to_machine() to deal with ioremapped pud updates.
  Use arbitrary_virt_to_machine() to deal with ioremapped pmd updates.
  xen/mmu: remove all ad-hoc stats stuff
  xen: use normal virt_to_machine for ptes
  xen: make a pile of mmu pvop functions static
  vmalloc: remove vmalloc_sync_all() from alloc_vm_area()
  xen: condense everything onto xen_set_pte
  xen: use mmu_update for xen_set_pte_at()
  xen: drop all the special iomap pte paths.
---

dc7acbb2518f250050179c8581a972df3b6a24f1