Commit 42387042 authored by David Woodhouse's avatar David Woodhouse
Browse files

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: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
parent 13ffb97a

arch/x86/include/asm/xen/interface.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -182,6 +182,9 @@ struct arch_shared_info { 
	unsigned long p2m_cr3;		/* cr3 value of the p2m address space */

	unsigned long p2m_cr3;		/* cr3 value of the p2m address space */

	unsigned long p2m_vaddr;	/* virtual address of the p2m list */

	unsigned long p2m_vaddr;	/* virtual address of the p2m list */

	unsigned long p2m_generation;	/* generation count of p2m mapping */

	unsigned long p2m_generation;	/* generation count of p2m mapping */

#ifdef CONFIG_X86_32

	uint32_t wc_sec_hi;

#endif

};

};

#endif	/* !__ASSEMBLY__ */

#endif	/* !__ASSEMBLY__ */

include/xen/interface/xen.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -598,7 +598,9 @@ struct shared_info { 
	 * their gettimeofday() syscall on this wallclock-base value.

	 * their gettimeofday() syscall on this wallclock-base value.

	 */

	 */

	struct pvclock_wall_clock wc;

	struct pvclock_wall_clock wc;



#ifndef CONFIG_X86_32

	uint32_t wc_sec_hi;

#endif

	struct arch_shared_info arch;

	struct arch_shared_info arch;





};

};