Rename definition of HYPERVISOR_VIRT_START to avoid conflict with
upstream Xen definition found in xen/interface/arch-x86/xen-x86_32.h. Submitted by: Roger Pau Monné Reviewed by: gibbs MFC after: 2 weeks
This commit is contained in:
parent
06c9f9bddf
commit
8ac6a7aa17
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=254671
@ -246,9 +246,8 @@ ASSYM(BUS_SPACE_HANDLE_IAT, offsetof(struct bus_space_handle, bsh_iat));
|
||||
#endif
|
||||
|
||||
#ifdef XEN
|
||||
#include <xen/hypervisor.h>
|
||||
ASSYM(PC_CR3, offsetof(struct pcpu, pc_cr3));
|
||||
ASSYM(HYPERVISOR_VIRT_START, __HYPERVISOR_VIRT_START);
|
||||
ASSYM(XEN_HYPERVISOR_VIRT_START, HYPERVISOR_VIRT_START);
|
||||
#endif
|
||||
|
||||
#ifdef HWPMC_HOOKS
|
||||
|
@ -76,7 +76,7 @@
|
||||
ELFNOTE(Xen, XEN_ELFNOTE_PADDR_OFFSET, .long, KERNBASE)
|
||||
ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, .long, btext)
|
||||
ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .long, hypercall_page)
|
||||
ELFNOTE(Xen, XEN_ELFNOTE_HV_START_LOW, .long, HYPERVISOR_VIRT_START)
|
||||
ELFNOTE(Xen, XEN_ELFNOTE_HV_START_LOW, .long, XEN_HYPERVISOR_VIRT_START)
|
||||
#if 0
|
||||
ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz, "writable_page_tables|writable_descriptor_tables|auto_translated_physmap|pae_pgdir_above_4gb|supervisor_mode_kernel")
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user