git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/sta529', 'asoc/topic/sti', 'asoc/topic...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
cpu
/
centaur.c
diff --git
a/arch/x86/kernel/cpu/centaur.c
b/arch/x86/kernel/cpu/centaur.c
index adc0ebd8bed0e17be1716f3fb7c3eab51b7fa0c4..43955ee6715b1876b89ebd615b8eb171bbde1dd0 100644
(file)
--- a/
arch/x86/kernel/cpu/centaur.c
+++ b/
arch/x86/kernel/cpu/centaur.c
@@
-105,8
+105,6
@@
static void early_init_centaur(struct cpuinfo_x86 *c)
#ifdef CONFIG_X86_64
set_cpu_cap(c, X86_FEATURE_SYSENTER32);
#endif
-
- clear_sched_clock_stable();
}
static void init_centaur(struct cpuinfo_x86 *c)