Skip to content

Commit

Permalink
Merge branch 'upstream/tidy-xen-mmu-2.6.39' of git://git.kernel.org/p…
Browse files Browse the repository at this point in the history
…ub/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.
  • Loading branch information
torvalds committed May 27, 2011
2 parents f01e1af + 4bf0ff2 commit dc7acbb
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 275 deletions.
Loading

0 comments on commit dc7acbb

Please sign in to comment.