diff options
| author | David Woodhouse <dwmw@amazon.co.uk> | 2020-12-03 21:02:23 +0000 |
|---|---|---|
| committer | David Woodhouse <dwmw@amazon.co.uk> | 2021-02-04 14:19:38 +0000 |
| commit | 42387042ba38cca8fb86bb3a7913e44cd3569750 (patch) | |
| tree | 244e2b06c42a5bb956b30f29bd2f2ed66a2aa537 | |
| parent | 13ffb97a3b11998450d51457b6b3617781953f7c (diff) | |
| download | lwn-42387042ba38cca8fb86bb3a7913e44cd3569750.tar.gz lwn-42387042ba38cca8fb86bb3a7913e44cd3569750.zip | |
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>
| -rw-r--r-- | arch/x86/include/asm/xen/interface.h | 3 | ||||
| -rw-r--r-- | include/xen/interface/xen.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/include/asm/xen/interface.h b/arch/x86/include/asm/xen/interface.h index 9139b3e86316..baca0b00ef76 100644 --- 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 8bfb242f433e..5ee37a296481 100644 --- 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; }; |