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
Revert "x86-64: Disable local APIC timer use on AMD systems with C1E"
[sfrench/cifs-2.6.git]
/
arch
/
x86_64
/
kernel
/
setup.c
diff --git
a/arch/x86_64/kernel/setup.c
b/arch/x86_64/kernel/setup.c
index 6fa0a302e2aa9b121daa487220b27efdbd88f570..af838f6b0b7fc9b7e3ed4de0ab12992e48cf9f18 100644
(file)
--- a/
arch/x86_64/kernel/setup.c
+++ b/
arch/x86_64/kernel/setup.c
@@
-608,6
+608,9
@@
static void __cpuinit init_amd(struct cpuinfo_x86 *c)
else
num_cache_leaves = 3;
+ if (c->x86 == 0xf || c->x86 == 0x10 || c->x86 == 0x11)
+ set_bit(X86_FEATURE_K8, &c->x86_capability);
+
/* RDTSC can be speculated around */
clear_bit(X86_FEATURE_SYNC_RDTSC, &c->x86_capability);