tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* '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
+2
-2
+2
-2
arch/x86/xen/mmu.c
+2
-2
arch/x86/xen/mmu.c
···
877
877
#else /* CONFIG_X86_32 */
878
878
#ifdef CONFIG_X86_PAE
879
879
/* Need to make sure unshared kernel PMD is pinnable */
880
-
xen_pin_page(mm, virt_to_page(pgd_page(pgd[pgd_index(TASK_SIZE)])),
880
+
xen_pin_page(mm, pgd_page(pgd[pgd_index(TASK_SIZE)]),
881
881
PT_PMD);
882
882
#endif
883
883
xen_do_pin(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(pgd)));
···
994
994
995
995
#ifdef CONFIG_X86_PAE
996
996
/* Need to make sure unshared kernel PMD is unpinned */
997
-
xen_unpin_page(mm, virt_to_page(pgd_page(pgd[pgd_index(TASK_SIZE)])),
997
+
xen_unpin_page(mm, pgd_page(pgd[pgd_index(TASK_SIZE)]),
998
998
PT_PMD);
999
999
#endif
1000
1000