[PATCH 4/4] Fill in missing pv_mmu_ops entries for PAGETABLE_LEVELS >= 3

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <linux-kernel@...>
Cc: <akpm@...>, <glommer@...>, <tglx@...>, <mingo@...>, <ehabkost@...>, <jeremy@...>, <avi@...>, <anthony@...>, <virtualization@...>, <rusty@...>, <ak@...>, <chrisw@...>, <rostedt@...>, <hpa@...>, <zach@...>, <roland@...>, <mtosatti@...>
Date: Monday, January 21, 2008 - 5:48 pm

This finally makes paravirt-ops able to compile and boot under x86_64.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 arch/x86/kernel/paravirt.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index 37f38b7..075962c 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -398,16 +398,23 @@ struct pv_mmu_ops pv_mmu_ops = {
 	.kmap_atomic_pte = kmap_atomic,
 #endif
 
+#if PAGETABLE_LEVELS >= 3
 #ifdef CONFIG_X86_PAE
 	.set_pte_atomic = native_set_pte_atomic,
 	.set_pte_present = native_set_pte_present,
-	.set_pud = native_set_pud,
 	.pte_clear = native_pte_clear,
 	.pmd_clear = native_pmd_clear,
-
+#endif
+	.set_pud = native_set_pud,
 	.pmd_val = native_pmd_val,
 	.make_pmd = native_make_pmd,
+
+#if PAGETABLE_LEVELS == 4
+	.pud_val = native_pud_val,
+	.make_pud = native_make_pud,
+	.set_pgd = native_set_pgd,
 #endif
+#endif /* PAGETABLE_LEVELS >= 3 */
 
 	.pte_val = native_pte_val,
 	.pgd_val = native_pgd_val,
-- 
1.5.3.4

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0/4] paravirt_ops-64 compile fixes, Eduardo Habkost, (Mon Jan 21, 5:48 pm)
Re: [PATCH 0/4] paravirt_ops-64 compile fixes, Ingo Molnar, (Tue Jan 22, 8:02 am)
Re: [PATCH 0/4] paravirt_ops-64 compile fixes, Eduardo Pereira Habkost, (Tue Jan 22, 8:34 am)
Re: [PATCH 0/4] paravirt_ops-64 compile fixes, Jeremy Fitzhardinge, (Tue Jan 22, 1:55 pm)
Re: [PATCH 0/4] paravirt_ops-64 compile fixes, Ingo Molnar, (Tue Jan 22, 3:47 pm)
Re: [PATCH 0/4] paravirt_ops-64 compile fixes, Jeremy Fitzhardinge, (Tue Jan 22, 4:05 pm)
[PATCH 1/2] Allow enabling PARAVIRT without any guest implem..., Eduardo Pereira Habkost, (Tue Jan 22, 2:50 pm)
[PATCH 2/2] Remove depends on X86_32 from PARAVIRT &amp; PAR..., Eduardo Pereira Habkost, (Tue Jan 22, 2:52 pm)
[PATCH 4/4] Fill in missing pv_mmu_ops entries for PAGETABLE..., Eduardo Habkost, (Mon Jan 21, 5:48 pm)
[PATCH 1/4] Add missing semicolon to SWAPGS macro, Eduardo Habkost, (Mon Jan 21, 5:48 pm)