ia64/xen-unstable

changeset 3380:e17a946c7a91

bitkeeper revision 1.1159.212.4 (41dd3c5fTm4eCHEfEnGmThdbM-wOQg)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen-unstable.bk
author cl349@arcadians.cl.cam.ac.uk
date Thu Jan 06 13:25:51 2005 +0000 (2005-01-06)
parents 4c2c41071357 275b77086005
children a6d0ee776c49
files Makefile xen/arch/x86/mtrr/generic.c
line diff
     1.1 --- a/Makefile	Tue Jan 04 11:44:16 2005 +0000
     1.2 +++ b/Makefile	Thu Jan 06 13:25:51 2005 +0000
     1.3 @@ -118,6 +118,43 @@ install-iptables:
     1.4  	( cd iptables-* ; \
     1.5  	  make PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install)
     1.6  
     1.7 +help:
     1.8 +	@echo 'Installation targets:'
     1.9 +	@echo '  install          - install everything'
    1.10 +	@echo '  install-xen      - install the Xen hypervisor'
    1.11 +	@echo '  install-tools    - install the control tools'
    1.12 +	@echo '  install-kernels  - install guest kernels'
    1.13 +	@echo '  install-docs     - install documentation'
    1.14 +	@echo ''
    1.15 +	@echo 'Building targets:'
    1.16 +	@echo '  dist             - build everything and place in dist/'
    1.17 +	@echo '  world            - clean everything, delete guest kernel build'
    1.18 +	@echo '                     trees then make dist'
    1.19 +	@echo '  xen              - build Xen hypervisor and place in dist/'
    1.20 +	@echo '  tools            - build tools and place in dist/'
    1.21 +	@echo '  kernels          - build guest kernels and place in dist/'
    1.22 +	@echo '  kbuild           - synonym for make kernels'
    1.23 +	@echo '  docs             - build docs and place in dist/'
    1.24 +	@echo ''
    1.25 +	@echo 'Cleaning targets:'
    1.26 +	@echo '  clean            - clean the Xen, tools and docs (but not'
    1.27 +	@echo '                     guest kernel) trees'
    1.28 +	@echo '  mrproper         - clean plus delete kernel tarballs and kernel'
    1.29 +	@echo '                     build trees'
    1.30 +	@echo '  kdelete          - delete guest kernel build trees'
    1.31 +	@echo '  kclean           - clean guest kernel build trees'
    1.32 +	@echo ''
    1.33 +	@echo 'Dependency installation targets:'
    1.34 +	@echo '  install-twisted  - install the Twisted Matrix Framework'
    1.35 +	@echo '  install-logging  - install the Python Logging package'
    1.36 +	@echo '  install-iptables - install iptables tools'
    1.37 +	@echo ''
    1.38 +	@echo 'Miscellaneous targets:'
    1.39 +	@echo '  mkpatches        - make patches against vanilla kernels from'
    1.40 +	@echo '                     sparse trees'
    1.41 +	@echo '  uninstall        - attempt to remove installed Xen tools (use'
    1.42 +	@echo '                     with extreme care!)'
    1.43 +
    1.44  # Use this target with extreme care!
    1.45  uninstall:
    1.46  	cp -a /etc/xen /etc/xen.old && rm -rf /etc/xen 
     2.1 --- a/xen/arch/x86/mtrr/generic.c	Tue Jan 04 11:44:16 2005 +0000
     2.2 +++ b/xen/arch/x86/mtrr/generic.c	Thu Jan 06 13:25:51 2005 +0000
     2.3 @@ -250,7 +250,7 @@ static void prepare_set(void)
     2.4  	/*  Save value of CR4 and clear Page Global Enable (bit 7)  */
     2.5  	if ( cpu_has_pge ) {
     2.6  		cr4 = read_cr4();
     2.7 -		write_cr4(cr4 & (unsigned char) ~(1 << 7));
     2.8 +		write_cr4(cr4 & ~X86_CR4_PGE);
     2.9  	}
    2.10  
    2.11  	/* Flush all TLBs via a mov %cr3, %reg; mov %reg, %cr3 */