[XenPPC] [xenppc-unstable] [POWERPC] fix bad merge

[Xen patchbot-xenppc-unstable <patchbot-xenppc-unstable@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