ia64/xen-unstable

changeset 6689:7d0fb56b4a91

merge?
author cl349@firebug.cl.cam.ac.uk
date Wed Sep 07 19:01:31 2005 +0000 (2005-09-07)
parents 38c5199155fc cbf43be4cc17
children b7c7cb88f0ba c2f3f18c0d95
files .hgignore linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c linux-2.6-xen-sparse/arch/xen/kernel/Makefile linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c linux-2.6-xen-sparse/arch/xen/kernel/reboot.c linux-2.6-xen-sparse/drivers/xen/blktap/blktap.h linux-2.6-xen-sparse/drivers/xen/netback/common.h linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c linux-2.6-xen-sparse/drivers/xen/tpmback/common.h linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c linux-2.6-xen-sparse/drivers/xen/usbback/common.h linux-2.6-xen-sparse/drivers/xen/usbfront/usbfront.c linux-2.6-xen-sparse/include/asm-xen/linux-public/privcmd.h tools/Makefile tools/Rules.mk tools/examples/init.d/xend tools/examples/vif-bridge tools/examples/vif-route tools/libxc/xc_linux_build.c tools/libxc/xenguest.h tools/misc/xend tools/python/setup.py tools/python/xen/lowlevel/xc/xc.c tools/python/xen/xend/XendDomain.py tools/python/xen/xend/XendDomainInfo.py tools/python/xen/xend/image.py tools/python/xen/xend/server/SrvDaemon.py tools/python/xen/xend/server/blkif.py tools/python/xen/xend/server/channel.py tools/python/xen/xend/server/controller.py tools/python/xen/xend/server/event.py tools/python/xen/xend/server/netif.py tools/python/xen/xend/server/tpmif.py tools/python/xen/xend/server/usbif.py tools/xenstore/Makefile xen/include/public/xen.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c	Wed Sep 07 19:01:05 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c	Wed Sep 07 19:01:31 2005 +0000
     1.3 @@ -106,7 +106,7 @@ void xen_l4_entry_update(pgd_t *ptr, pgd
     1.4  void xen_machphys_update(unsigned long mfn, unsigned long pfn)
     1.5  {
     1.6  	mmu_update_t u;
     1.7 -	u.ptr = (mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE;
     1.8 +	u.ptr = ((unsigned long long)mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE;
     1.9  	u.val = pfn;
    1.10  	BUG_ON(HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF) < 0);
    1.11  }