# HG changeset patch
# User cl349@firebug.cl.cam.ac.uk
# Date 1126119691 0
# Node ID 7d0fb56b4a916cccc497d200e6a8329537ce740d
# Parent  38c5199155fc111f3209438b4474775a1736120f# Parent  cbf43be4cc17dd9a85de958d6b14db28553be6ca
merge?

diff -r 38c5199155fc -r 7d0fb56b4a91 .hgignore
diff -r 38c5199155fc -r 7d0fb56b4a91 linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c
--- a/linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c	Wed Sep 07 19:01:05 2005 +0000
+++ b/linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c	Wed Sep 07 19:01:31 2005 +0000
@@ -106,7 +106,7 @@ void xen_l4_entry_update(pgd_t *ptr, pgd
 void xen_machphys_update(unsigned long mfn, unsigned long pfn)
 {
 	mmu_update_t u;
-	u.ptr = (mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE;
+	u.ptr = ((unsigned long long)mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE;
 	u.val = pfn;
 	BUG_ON(HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF) < 0);
 }
diff -r 38c5199155fc -r 7d0fb56b4a91 linux-2.6-xen-sparse/arch/xen/kernel/Makefile
diff -r 38c5199155fc -r 7d0fb56b4a91 linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
diff -r 38c5199155fc -r 7d0fb56b4a91 linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
diff -r 38c5199155fc -r 7d0fb56b4a91 linux-2.6-xen-sparse/drivers/xen/blktap/blktap.h
diff -r 38c5199155fc -r 7d0fb56b4a91 linux-2.6-xen-sparse/drivers/xen/netback/common.h
diff -r 38c5199155fc -r 7d0fb56b4a91 linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
diff -r 38c5199155fc -r 7d0fb56b4a91 linux-2.6-xen-sparse/drivers/xen/tpmback/common.h
diff -r 38c5199155fc -r 7d0fb56b4a91 linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c
diff -r 38c5199155fc -r 7d0fb56b4a91 linux-2.6-xen-sparse/drivers/xen/usbback/common.h
diff -r 38c5199155fc -r 7d0fb56b4a91 linux-2.6-xen-sparse/drivers/xen/usbfront/usbfront.c
diff -r 38c5199155fc -r 7d0fb56b4a91 linux-2.6-xen-sparse/include/asm-xen/linux-public/privcmd.h
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/Makefile
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/Rules.mk
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/examples/init.d/xend
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/examples/vif-bridge
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/examples/vif-route
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/libxc/xc_linux_build.c
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/libxc/xenguest.h
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/misc/xend
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/python/setup.py
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/python/xen/lowlevel/xc/xc.c
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/python/xen/xend/XendDomain.py
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/python/xen/xend/XendDomainInfo.py
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/python/xen/xend/image.py
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/python/xen/xend/server/SrvDaemon.py
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/python/xen/xend/server/blkif.py
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/python/xen/xend/server/channel.py
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/python/xen/xend/server/controller.py
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/python/xen/xend/server/event.py
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/python/xen/xend/server/netif.py
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/python/xen/xend/server/tpmif.py
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/python/xen/xend/server/usbif.py
diff -r 38c5199155fc -r 7d0fb56b4a91 tools/xenstore/Makefile
diff -r 38c5199155fc -r 7d0fb56b4a91 xen/include/public/xen.h