Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, xen: fix use of pgd_page now that it really does return a page

diff --combined arch/x86/xen/mmu.c
index 89f3b6edc65a0996fbc111d5c7c82084d1fa4bfc,49697d86c6a5e1efc4b6cfe6f928d54663129286..688936044dc95cdac8d6ce79e3ee10f39e898178
--- 1/arch/x86/xen/mmu.c
--- 2/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@@ -850,16 -850,13 +850,16 @@@ static int xen_pin_page(struct mm_struc
     read-only, and can be pinned. */
  static void __xen_pgd_pin(struct mm_struct *mm, pgd_t *pgd)
  {
 +      vm_unmap_aliases();
 +
        xen_mc_batch();
  
 -      if (xen_pgd_walk(mm, xen_pin_page, USER_LIMIT)) {
 -              /* re-enable interrupts for kmap_flush_unused */
 +       if (xen_pgd_walk(mm, xen_pin_page, USER_LIMIT)) {
 +              /* re-enable interrupts for flushing */
                xen_mc_issue(0);
 +
                kmap_flush_unused();
 -              vm_unmap_aliases();
 +
                xen_mc_batch();
        }
  
@@@ -877,7 -874,7 +877,7 @@@
  #else /* CONFIG_X86_32 */
  #ifdef CONFIG_X86_PAE
        /* Need to make sure unshared kernel PMD is pinnable */
-       xen_pin_page(mm, virt_to_page(pgd_page(pgd[pgd_index(TASK_SIZE)])),
+       xen_pin_page(mm, pgd_page(pgd[pgd_index(TASK_SIZE)]),
                     PT_PMD);
  #endif
        xen_do_pin(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(pgd)));
@@@ -994,7 -991,7 +994,7 @@@ static void __xen_pgd_unpin(struct mm_s
  
  #ifdef CONFIG_X86_PAE
        /* Need to make sure unshared kernel PMD is unpinned */
-       xen_unpin_page(mm, virt_to_page(pgd_page(pgd[pgd_index(TASK_SIZE)])),
+       xen_unpin_page(mm, pgd_page(pgd[pgd_index(TASK_SIZE)]),
                       PT_PMD);
  #endif