From owner-svn-src-head@FreeBSD.ORG  Thu Aug 22 20:07:07 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 1DE2028B;
 Thu, 22 Aug 2013 20:07:07 +0000 (UTC)
 (envelope-from gibbs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0BDA92B28;
 Thu, 22 Aug 2013 20:07:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7MK76KN003472;
 Thu, 22 Aug 2013 20:07:06 GMT (envelope-from gibbs@svn.freebsd.org)
Received: (from gibbs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7MK76N3003470;
 Thu, 22 Aug 2013 20:07:06 GMT (envelope-from gibbs@svn.freebsd.org)
Message-Id: <201308222007.r7MK76N3003470@svn.freebsd.org>
From: "Justin T. Gibbs" <gibbs@FreeBSD.org>
Date: Thu, 22 Aug 2013 20:07:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r254671 - in head/sys/i386: i386 xen
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Aug 2013 20:07:07 -0000

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