[Xen-changelog] [xen-unstable] [POWERPC] fix bad merge

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
# Node ID caba587e6656ec0c5600dd31f7a66bd8eb913d9e
# Parent  5c2501d81ee1b172c346ba3c2273776705d50cac
[POWERPC] fix bad merge
Signed-off-by: Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx>
---
 tools/libxc/powerpc64/xc_linux_build.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 5c2501d81ee1 -r caba587e6656 tools/libxc/powerpc64/xc_linux_build.c
--- a/tools/libxc/powerpc64/xc_linux_build.c    Sun Aug 20 11:07:52 2006 -0400
+++ b/tools/libxc/powerpc64/xc_linux_build.c    Sun Aug 20 13:00:31 2006 -0400
@@ -309,7 +309,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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog