ia64/xen-unstable

changeset 2555:1fc8bdfed466

bitkeeper revision 1.1159.1.181 (41545d70aJFDfT53nsymFo3rjZF1hQ)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-nbsd
author cl349@freefall.cl.cam.ac.uk
date Fri Sep 24 17:46:24 2004 +0000 (2004-09-24)
parents b3e98ee24986 c1e127be2529
children 376368a98ad9 62b8e960db56
files linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/cpu/common.c linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/timers/Makefile linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h
line diff
     1.1 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/cpu/common.c	Fri Sep 24 17:08:40 2004 +0000
     1.2 +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/cpu/common.c	Fri Sep 24 17:46:24 2004 +0000
     1.3 @@ -534,7 +534,7 @@ void __init cpu_init (void)
     1.4  	}
     1.5  	printk(KERN_INFO "Initializing CPU#%d\n", cpu);
     1.6  
     1.7 -	if (cpu_has_vme || cpu_has_tsc || cpu_has_de)
     1.8 +	if (cpu_has_vme || cpu_has_de)
     1.9  		clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE);
    1.10  	if (tsc_disable && cpu_has_tsc) {
    1.11  		printk(KERN_NOTICE "Disabling TSC...\n");
     2.1 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/timers/Makefile	Fri Sep 24 17:08:40 2004 +0000
     2.2 +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/timers/Makefile	Fri Sep 24 17:46:24 2004 +0000
     2.3 @@ -5,7 +5,7 @@
     2.4  XENARCH	:= $(subst ",,$(CONFIG_XENARCH))
     2.5  
     2.6  obj-y :=	timer_tsc.o
     2.7 -c-obj-y :=	timer.o common.o timer_none.o timer_pit.o
     2.8 +c-obj-y :=	timer.o timer_none.o timer_pit.o
     2.9  
    2.10  c-link	:=
    2.11  
     3.1 --- a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h	Fri Sep 24 17:08:40 2004 +0000
     3.2 +++ b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h	Fri Sep 24 17:46:24 2004 +0000
     3.3 @@ -27,7 +27,6 @@ void __init machine_specific_modify_cpu_
     3.4  	clear_bit(X86_FEATURE_VME, c->x86_capability);
     3.5  	clear_bit(X86_FEATURE_DE, c->x86_capability);
     3.6  	clear_bit(X86_FEATURE_PSE, c->x86_capability);
     3.7 -	clear_bit(X86_FEATURE_TSC, c->x86_capability);
     3.8  	clear_bit(X86_FEATURE_PGE, c->x86_capability);
     3.9  	clear_bit(X86_FEATURE_MTRR, c->x86_capability);
    3.10  	clear_bit(X86_FEATURE_FXSR, c->x86_capability);