mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
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
This commit is contained in:
cl349@freefall.cl.cam.ac.uk committed
commit
c4c5df79c4
3 files changed
+2
-3
No files matched your search
@@ -534,7 +534,7 @@ void __init cpu_init (void)
|
||||
}
|
||||
printk(KERN_INFO "Initializing CPU#%d\n", cpu);
|
||||
|
||||
if (cpu_has_vme || cpu_has_tsc || cpu_has_de)
|
||||
if (cpu_has_vme || cpu_has_de)
|
||||
clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE);
|
||||
if (tsc_disable && cpu_has_tsc) {
|
||||
printk(KERN_NOTICE "Disabling TSC...\n");
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
XENARCH := $(subst ",,$(CONFIG_XENARCH))
|
||||
|
||||
obj-y := timer_tsc.o
|
||||
c-obj-y := timer.o common.o timer_none.o timer_pit.o
|
||||
c-obj-y := timer.o timer_none.o timer_pit.o
|
||||
|
||||
c-link :=
|
||||
|
||||
|
||||
@@ -27,7 +27,6 @@ void __init machine_specific_modify_cpu_capabilities(struct cpuinfo_x86 *c)
|
||||
clear_bit(X86_FEATURE_VME, c->x86_capability);
|
||||
clear_bit(X86_FEATURE_DE, c->x86_capability);
|
||||
clear_bit(X86_FEATURE_PSE, c->x86_capability);
|
||||
clear_bit(X86_FEATURE_TSC, c->x86_capability);
|
||||
clear_bit(X86_FEATURE_PGE, c->x86_capability);
|
||||
clear_bit(X86_FEATURE_MTRR, c->x86_capability);
|
||||
clear_bit(X86_FEATURE_FXSR, c->x86_capability);
|
||||
|
||||