From c5fb44c57d58c630c21aee0c7a316ae09aa33a84 Mon Sep 17 00:00:00 2001 From: gibbs Date: Thu, 22 Aug 2013 20:07:06 +0000 Subject: Rename definition of HYPERVISOR_VIRT_START to avoid conflict with upstream Xen definition found in xen/interface/arch-x86/xen-x86_32.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Submitted by: Roger Pau Monné Reviewed by: gibbs MFC after: 2 weeks --- sys/i386/xen/locore.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/i386/xen') 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 -- cgit v1.1