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] fix bad merge

To: xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
Subject: [XenPPC] [xenppc-unstable] [POWERPC] fix bad merge
From: Xen patchbot-xenppc-unstable <patchbot-xenppc-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Sun, 20 Aug 2006 17:12:06 +0000
Delivery-date: Sun, 20 Aug 2006 10:22:25 -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 Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
# Node ID b1fd0275383baa78830f70c8b15d7ac0f3510f4d
# Parent  4055b6b010a4ccdd480abae1a97d1ca9de18703e
[POWERPC] fix bad merge
---
 tools/libxc/powerpc64/xc_linux_build.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 4055b6b010a4 -r b1fd0275383b tools/libxc/powerpc64/xc_linux_build.c
--- a/tools/libxc/powerpc64/xc_linux_build.c    Sun Aug 20 11:09:37 2006 -0400
+++ b/tools/libxc/powerpc64/xc_linux_build.c    Sun Aug 20 13:00:31 2006 -0400
@@ -349,7 +349,7 @@ static unsigned long create_start_info(s
     si->store_evtchn = store_evtchn;
     si->console.domU.mfn = si->nr_pages - 3;
     si->console.domU.evtchn = console_evtchn;
-    si_addr = si->nr_pages - 4;
+    si_addr = (si->nr_pages - 4) << PAGE_SHIFT;
 
     return si_addr;
 }

_______________________________________________
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] fix bad merge, Xen patchbot-xenppc-unstable <=