tree bc14a36d5cfe1a1aa0d9a2a18ea6f19ad88a8958
parent f01e1af445fac107e91d62a2d59dd535f633810b
parent 4bf0ff24e371ce71521ccb21513203facfd8491f
author Linus Torvalds <torvalds@linux-foundation.org> 1306461675 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1306461675 -0700

Merge branch 'upstream/tidy-xen-mmu-2.6.39' of git://git.kernel.org/pub/scm/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.