Skip to contentSkip to conversation

x86/vsdo: Fix build on PARAVIRT_CLOCK=y, KVM_GUEST=n

PATCH In review Andy Lutomirski 2 participants 2 messages Dec 23, 2015 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/vsdo: Fix build on PARAVIRT_CLOCK=y, KVM_GUEST=n

---

This is for tip:x86/asm.

arch/x86/include/asm/pvclock.h | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/pvclock.h +1 -1
index 66df22b2e0c9..fdcc04020636 100644
@@ -4,7 +4,7 @@
 #include <linux/clocksource.h>
 #include <asm/pvclock-abi.h>
 
-#ifdef CONFIG_PARAVIRT_CLOCK
+#ifdef CONFIG_KVM_GUEST
 extern struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void);
 #else
 static inline struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void)
Signature · 1 line
2.5.0
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 23 lines · Andy Lutomirski

---

This is for tip:x86/asm.

arch/x86/include/asm/pvclock.h | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/pvclock.h +1 -1
index 66df22b2e0c9..fdcc04020636 100644
@@ -4,7 +4,7 @@
 #include <linux/clocksource.h>
 #include <asm/pvclock-abi.h>
 
-#ifdef CONFIG_PARAVIRT_CLOCK
+#ifdef CONFIG_KVM_GUEST
 extern struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void);
 #else
 static inline struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void)
Signature · 1 line
2.5.0
Signature · 4 lines
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.