From: BitKeeper B. <ri...@su...> - 2005-02-27 11:03:34
|
ChangeSet 1.1270, 2005/02/27 10:38:13+00:00, ka...@sc... Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk include/asm-xen/system.h | 2 +- mkbuildtree | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff -Nru a/linux-2.4.29-xen-sparse/include/asm-xen/system.h b/linux-2.4.29-xen-sparse/include/asm-xen/system.h --- a/linux-2.4.29-xen-sparse/include/asm-xen/system.h 2005-02-27 06:03:29 -05:00 +++ b/linux-2.4.29-xen-sparse/include/asm-xen/system.h 2005-02-27 06:03:29 -05:00 @@ -109,7 +109,7 @@ /* NB. 'clts' is done for us by Xen during virtual trap. */ #define clts() ((void)0) -#define stts() (HYPERVISOR_fpu_taskswitch()) +#define stts() (HYPERVISOR_fpu_taskswitch(1)) #endif /* __KERNEL__ */ diff -Nru a/linux-2.4.29-xen-sparse/mkbuildtree b/linux-2.4.29-xen-sparse/mkbuildtree --- a/linux-2.4.29-xen-sparse/mkbuildtree 2005-02-27 06:03:29 -05:00 +++ b/linux-2.4.29-xen-sparse/mkbuildtree 2005-02-27 06:03:29 -05:00 @@ -163,6 +163,7 @@ ln -sf ../asm-i386/mmx.h ln -sf ../asm-i386/mpspec.h ln -sf ../asm-i386/msgbuf.h +ln -sf ../asm-i386/msr.h ln -sf ../asm-i386/mtrr.h ln -sf ../asm-i386/namei.h ln -sf ../asm-i386/param.h @@ -282,4 +283,12 @@ cd ${AD}/arch/xen/drivers/blkif/frontend ln -sf ../../../../../${LINUX_26}/drivers/xen/blkfront/blkfront.c - +cd ${AD}/arch/xen/drivers/usbif/frontend +ln -sf ../../../../../${LINUX_26}/drivers/xen/usbfront/usbfront.c main.c +ln -sf ../../../../../${LINUX_26}/drivers/xen/usbfront/xhci.h + +cd ${AD}/arch/xen/drivers/usbif/backend +ln -sf ../../../../../${LINUX_26}/drivers/xen/usbback/common.h +ln -sf ../../../../../${LINUX_26}/drivers/xen/usbback/control.c +ln -sf ../../../../../${LINUX_26}/drivers/xen/usbback/interface.c +ln -sf ../../../../../${LINUX_26}/drivers/xen/usbback/usbback.c main.c |