Author: gibbs
Date: Thu Aug 22 20:07:06 2013
New Revision: 254671
URL: http://svnweb.freebsd.org/changeset/base/254671
Log:
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
Modified:
head/sys/i386/i386/genassym.c
head/sys/i386/xen/locore.s
Modified: head/sys/i386/i386/genassym.c
==============================================================================
--- head/sys/i386/i386/genassym.c Thu Aug 22 19:28:13 2013
(r254670)
+++ head/sys/i386/i386/genassym.c Thu Aug 22 20:07:06 2013
(r254671)
@@ -246,9 +246,8 @@ ASSYM(BUS_SPACE_HANDLE_IAT, offsetof(str
#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
Modified: head/sys/i386/xen/locore.s
==============================================================================
--- head/sys/i386/xen/locore.s Thu Aug 22 19:28:13 2013 (r254670)
+++ head/sys/i386/xen/locore.s Thu Aug 22 20:07:06 2013 (r254671)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
