diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-07 12:17:59 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-07 12:17:59 -0500 |
| commit | cb110171a65c5a2d85ec814d498986db611040fd (patch) | |
| tree | 1b56e18eff0c6fc72625896ad83916927b1f743c /arch/x86 | |
| parent | 55477eb49d1e56927358f90762a8a19b61c6cb53 (diff) | |
| parent | 47cb2ed9df2789fc4a3fe1201e475078f93c4839 (diff) | |
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
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/xen/mmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 89f3b6edc65a..688936044dc9 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
| @@ -877,7 +877,7 @@ static void __xen_pgd_pin(struct mm_struct *mm, pgd_t *pgd) | |||
| 877 | #else /* CONFIG_X86_32 */ | 877 | #else /* CONFIG_X86_32 */ |
| 878 | #ifdef CONFIG_X86_PAE | 878 | #ifdef CONFIG_X86_PAE |
| 879 | /* Need to make sure unshared kernel PMD is pinnable */ | 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 | PT_PMD); | 881 | PT_PMD); |
| 882 | #endif | 882 | #endif |
| 883 | xen_do_pin(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(pgd))); | 883 | xen_do_pin(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(pgd))); |
| @@ -994,7 +994,7 @@ static void __xen_pgd_unpin(struct mm_struct *mm, pgd_t *pgd) | |||
| 994 | 994 | ||
| 995 | #ifdef CONFIG_X86_PAE | 995 | #ifdef CONFIG_X86_PAE |
| 996 | /* Need to make sure unshared kernel PMD is unpinned */ | 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 | PT_PMD); | 998 | PT_PMD); |
| 999 | #endif | 999 | #endif |
| 1000 | 1000 | ||