From d3b7f999bde68b66e3bcec125fcdf2405b41a821 Mon Sep 17 00:00:00 2001 From: "mwilli2@equilibrium.research" Date: Tue, 4 Jan 2005 03:21:02 +0000 Subject: [PATCH 1/2] bitkeeper revision 1.1159.170.79 (41da0b9euJEutyxkK6O6_20FgU0cQQ) Add help target to top level makefile. --- Makefile | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/Makefile b/Makefile index 7d4d23f7ef..7332978f99 100644 --- a/Makefile +++ b/Makefile @@ -118,6 +118,43 @@ install-iptables: ( cd iptables-* ; \ make PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install) +help: + @echo 'Installation targets:' + @echo ' install - install everything' + @echo ' install-xen - install the Xen hypervisor' + @echo ' install-tools - install the control tools' + @echo ' install-kernels - install guest kernels' + @echo ' install-docs - install documentation' + @echo '' + @echo 'Building targets:' + @echo ' dist - build everything and place in dist/' + @echo ' world - clean everything, delete guest kernel build' + @echo ' trees then make dist' + @echo ' xen - build Xen hypervisor and place in dist/' + @echo ' tools - build tools and place in dist/' + @echo ' kernels - build guest kernels and place in dist/' + @echo ' kbuild - synonym for make kernels' + @echo ' docs - build docs and place in dist/' + @echo '' + @echo 'Cleaning targets:' + @echo ' clean - clean the Xen, tools and docs (but not' + @echo ' guest kernel) trees' + @echo ' mrproper - clean plus delete kernel tarballs and kernel' + @echo ' build trees' + @echo ' kdelete - delete guest kernel build trees' + @echo ' kclean - clean guest kernel build trees' + @echo '' + @echo 'Dependency installation targets:' + @echo ' install-twisted - install the Twisted Matrix Framework' + @echo ' install-logging - install the Python Logging package' + @echo ' install-iptables - install iptables tools' + @echo '' + @echo 'Miscellaneous targets:' + @echo ' mkpatches - make patches against vanilla kernels from' + @echo ' sparse trees' + @echo ' uninstall - attempt to remove installed Xen tools (use' + @echo ' with extreme care!)' + # Use this target with extreme care! uninstall: cp -a /etc/xen /etc/xen.old && rm -rf /etc/xen From bfe8a79541253bccea6cd5633d80b4da6673aad5 Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Wed, 5 Jan 2005 21:27:20 +0000 Subject: [PATCH 2/2] bitkeeper revision 1.1159.213.2 (41dc5bb8NoFeyC8xMcZdstILsQ-Tqg) patch from Leendert van Doorn Hyperthreading on VMX is broken in the xeno-unstable.bk tree. The diff below fixes this. It turns out that the mtrr code clears too many bits, some of them cause Xen to crash. Being a bit more precise fixes the problem. --- xen/arch/x86/mtrr/generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mtrr/generic.c b/xen/arch/x86/mtrr/generic.c index 8da0c5b43c..93d35350a7 100644 --- a/xen/arch/x86/mtrr/generic.c +++ b/xen/arch/x86/mtrr/generic.c @@ -250,7 +250,7 @@ static void prepare_set(void) /* Save value of CR4 and clear Page Global Enable (bit 7) */ if ( cpu_has_pge ) { cr4 = read_cr4(); - write_cr4(cr4 & (unsigned char) ~(1 << 7)); + write_cr4(cr4 & ~X86_CR4_PGE); } /* Flush all TLBs via a mov %cr3, %reg; mov %reg, %cr3 */