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-ppc-devel

[XenPPC] [xenppc-unstable] [powerpc] local branch merge

To: xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
Subject: [XenPPC] [xenppc-unstable] [powerpc] local branch merge
From: Xen patchbot-xenppc-unstable <patchbot-xenppc-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 28 Jul 2006 16:22:42 +0000
Delivery-date: Fri, 28 Jul 2006 11:31:54 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-ppc-devel-request@lists.xensource.com?subject=help>
List-id: Xen PPC development <xen-ppc-devel.lists.xensource.com>
List-post: <mailto:xen-ppc-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-ppc-devel>, <mailto:xen-ppc-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-ppc-devel>, <mailto:xen-ppc-devel-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-ppc-devel-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Hollis Blanchard <hollisb@xxxxxxxxxx>
# Node ID b36a361d3d757f6cb1a75153984c31d923e5cc9c
# Parent  f12c1e6a7ede1c34bee9176ade23b1a32617baba
# Parent  12da2c3245bbbf63781e2ad5e6f2eb489d93957c
[powerpc] local branch merge
Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx>
---
 .hgignore                   |    8 ++++----
 xen/arch/powerpc/usercopy.c |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff -r f12c1e6a7ede -r b36a361d3d75 .hgignore
--- a/.hgignore Thu Jul 27 17:44:14 2006 -0500
+++ b/.hgignore Fri Jul 28 09:58:43 2006 -0500
@@ -198,7 +198,7 @@
 ^xen/xen$
 ^xen/xen-syms$
 ^xen/xen\..*$
-^xen/arch/ppc/dom0\.bin$
-^xen/arch/ppc/asm-offsets\.s$
-^xen/arch/ppc/firmware
-^xen/arch/ppc/firmware_image
+^xen/arch/powerpc/dom0\.bin$
+^xen/arch/powerpc/asm-offsets\.s$
+^xen/arch/powerpc/firmware
+^xen/arch/powerpc/firmware_image
diff -r f12c1e6a7ede -r b36a361d3d75 xen/arch/powerpc/usercopy.c
--- a/xen/arch/powerpc/usercopy.c       Thu Jul 27 17:44:14 2006 -0500
+++ b/xen/arch/powerpc/usercopy.c       Fri Jul 28 09:58:43 2006 -0500
@@ -238,5 +238,5 @@ int xencomm_handle_is_null(void *ptr)
 
     desc = (struct xencomm_desc *)paddr_to_maddr((unsigned long)ptr);
 
-    return (desc->address[0] == XENCOMM_INVALID);
-}
+    return (desc->nr_addrs == 0);
+}

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

<Prev in Thread] Current Thread [Next in Thread>
  • [XenPPC] [xenppc-unstable] [powerpc] local branch merge, Xen patchbot-xenppc-unstable <=