diff options
| author | gibbs <gibbs@FreeBSD.org> | 2013-08-22 20:07:06 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 2013-08-22 20:07:06 +0000 |
| commit | c5fb44c57d58c630c21aee0c7a316ae09aa33a84 (patch) | |
| tree | dc871e37e444b7e212e1632205c3f7aa8e2cfe06 /sys | |
| parent | bb850902cd5affbeac1349f4a5441d511f8ecd11 (diff) | |
| download | FreeBSD-src-c5fb44c57d58c630c21aee0c7a316ae09aa33a84.zip FreeBSD-src-c5fb44c57d58c630c21aee0c7a316ae09aa33a84.tar.gz | |
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
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/i386/i386/genassym.c | 3 | ||||
| -rw-r--r-- | sys/i386/xen/locore.s | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c index 2394c09..78e4a61 100644 --- a/sys/i386/i386/genassym.c +++ b/sys/i386/i386/genassym.c @@ -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 diff --git a/sys/i386/xen/locore.s b/sys/i386/xen/locore.s index 59cdb547..b67046e 100644 --- a/sys/i386/xen/locore.s +++ b/sys/i386/xen/locore.s @@ -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 |
