xen: add wc_sec_hi to struct shared_info

Xen added this in 2015 (Xen 4.6). On x86_64 and Arm it fills what was
previously a 32-bit hole in the generic shared_info structure; on
i386 it had to go at the end of struct arch_shared_info.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>

diff --git a/arch/x86/include/asm/xen/interface.h b/arch/x86/include/asm/xen/interface.h
index 9139b3e86316114c0eb8c7cb8d50998d0c918a02..baca0b00ef7687856607b19f214309c00b329cb9 100644 (file)
--- a/arch/x86/include/asm/xen/interface.h
+++ b/arch/x86/include/asm/xen/interface.h
@@ -182,6 +182,9 @@ struct arch_shared_info {
        unsigned long p2m_cr3;          /* cr3 value of the p2m address space */
        unsigned long p2m_vaddr;        /* virtual address of the p2m list */
        unsigned long p2m_generation;   /* generation count of p2m mapping */
+#ifdef CONFIG_X86_32
+       uint32_t wc_sec_hi;
+#endif
 };
 #endif /* !__ASSEMBLY__ */
 

diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h
index 8bfb242f433e461a84ccd28b317f226d5e64c232..5ee37a2964811bfbf4caaf12023beb934a1b72d5 100644 (file)
--- a/include/xen/interface/xen.h
+++ b/include/xen/interface/xen.h
@@ -598,7 +598,9 @@ struct shared_info {
         * their gettimeofday() syscall on this wallclock-base value.
         */
        struct pvclock_wall_clock wc;
-
+#ifndef CONFIG_X86_32
+       uint32_t wc_sec_hi;
+#endif
        struct arch_shared_info arch;
 
 };