WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] Minor changes due to file movement to merge xen-unstable

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] Minor changes due to file movement to merge xen-unstable with xen-ia64-unstable
From: Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Sat, 03 Dec 2005 12:04:31 +0000
Delivery-date: Sat, 03 Dec 2005 12:07:25 +0000
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID d616f22ffdd953b7eda915a68588cf98f336eaf7
# Parent  28bd01c9b59604dfccac2c306d479ce6b5ac0fe5
Minor changes due to file movement to merge xen-unstable with xen-ia64-unstable

diff -r 28bd01c9b596 -r d616f22ffdd9 xen/arch/ia64/Makefile
--- a/xen/arch/ia64/Makefile    Fri Dec  2 18:52:25 2005
+++ b/xen/arch/ia64/Makefile    Fri Dec  2 18:55:00 2005
@@ -69,6 +69,8 @@
        [ -e $(BASEDIR)/include/asm-ia64/xen ] \
         || ln -s $(BASEDIR)/include/asm-ia64/linux 
$(BASEDIR)/include/asm-ia64/xen
 # Link to DM file in Xen for ia64/vti
+       [ -e $(BASEDIR)/include/asm-ia64/vmx_vpic.h ] \
+        || ln -s ../../include/asm-x86/vmx_vpic.h 
$(BASEDIR)/include/asm-ia64/vmx_vpic.h
        [ -e $(BASEDIR)/include/asm-ia64/vmx_vioapic.h ] \
         || ln -s ../../include/asm-x86/vmx_vioapic.h 
$(BASEDIR)/include/asm-ia64/vmx_vioapic.h
        [ -e $(BASEDIR)/arch/ia64/vmx/vmx_vioapic.c ] \
diff -r 28bd01c9b596 -r d616f22ffdd9 xen/include/public/io/blkif.h
--- a/xen/include/public/io/blkif.h     Fri Dec  2 18:52:25 2005
+++ b/xen/include/public/io/blkif.h     Fri Dec  2 18:55:00 2005
@@ -10,6 +10,8 @@
 #define __XEN_PUBLIC_IO_BLKIF_H__
 
 #include "ring.h"
+
+#include <asm-xen/gnttab.h>    /* for grant_ref_t */
 
 /*
  * Front->back notifications: When enqueuing a new request, sending a

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] Minor changes due to file movement to merge xen-unstable with xen-ia64-unstable, Xen patchbot -unstable <=